update and refresh fixes

corerefresh

@@ -20,7 +20,4 @@ EOF
 clear
 print_logo
 
-echo "Getting the latest changes to CoreDesktop..."
-
-git -C ~/.local/share/coredesktop pull
 bash ~/.local/share/coredesktop/install.sh

coreupdate

@@ -28,6 +28,18 @@ sudo cp ~/.local/share/coredesktop/corerefresh ~/.local/bin/corerefresh
 echo "Updating Arch..."
 sudo pacman -Syu
 
+cd ~/.local/share/coredesktop
+source utils.sh
+source packages.conf
+
+echo "Checking for new packages..."
+install_packages "${SYSTEM_UTILS[@]}"
+install_packages "${DEV_TOOLS[@]}"
+install_packages "${MAINTENANCE[@]}"
+install_packages "${DESKTOP[@]}"
+install_packages "${MEDIA[@]}"
+install_packages "${FONTS[@]}"
+
 echo "Updating AUR..."
 
 if ! yay -Sua 2>/dev/null; then
@@ -53,18 +65,6 @@ mise upgrade --bump ruby
 mise reshim
 gem update
 
-cd ~/.local/share/coredesktop
-source utils.sh
-source packages.conf
-
-echo "Checking for new packages..."
-install_packages "${SYSTEM_UTILS[@]}"
-install_packages "${DEV_TOOLS[@]}"
-install_packages "${MAINTENANCE[@]}"
-install_packages "${DESKTOP[@]}"
-install_packages "${MEDIA[@]}"
-install_packages "${FONTS[@]}"
-
 echo "Checking for new flatpaks..."
 . install-flatpaks.sh
 

install.sh

@@ -40,10 +40,13 @@ else
   echo "git is installed."
 fi
 
-# Clone the latest CoreDesktop repo into the standard data directory
+# Update or clone the CoreDesktop repo
 echo "Getting the latest version of CoreDesktop..."
-rm -rf ~/.local/share/coredesktop
-git clone https://gitea.federated.computer/david/coredesktop.git ~/.local/share/coredesktop > /dev/null
+if [ -d "$HOME/.local/share/coredesktop/.git" ]; then
+  git -C ~/.local/share/coredesktop pull
+else
+  git clone https://gitea.federated.computer/david/coredesktop.git ~/.local/share/coredesktop
+fi
 
 # Install the corerefresh and coreupdate management scripts to the user's bin
 mkdir -p ~/.local/bin