fix backup and restore config

Author: tanhongit

.backup/run.sh

@@ -20,17 +20,17 @@ if [ -f "/etc/os-release" ]; then
     if [ "$OS" == "Ubuntu" ]; then
         cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/dconf ../ubuntu/.config/dconf
         cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/mimeapps.list ../ubuntu/.config/mimeapps.list
-        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/sounds ../ubuntu/.local/share/sounds
         cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/gnome-shell ../ubuntu/.config/gnome-shell
 
-        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/gnome-shell ../ubuntu/.local/share/gnome-shell
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/sounds ../ubuntu/.local/share/sounds
         cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/grilo-plugins ../ubuntu/.local/share/grilo-plugins
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/gnome-shell ../ubuntu/.local/share/gnome-shell
 
     elif [ "$OS" == "Zorin OS" ]; then
         cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/dconf ../zorin/.config/dconf
         cp -TRv "${ZSH_CUSTOM:-$HOME}"/.config/mimeapps.list ../zorin/.config/mimeapps.list
-        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/sounds ../zorin/.local/share/sounds
 
+        cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/sounds ../zorin/.local/share/sounds
         cp -TRv "${ZSH_CUSTOM:-$HOME}"/.local/share/gnome-shell ../zorin/.local/share/gnome-shell
     fi
 fi

.setup/options/setup/after-setup.sh

@@ -22,12 +22,25 @@ while true; do
         sudo apt install gir1.2-gda-5.0 gir1.2-gsound-1.0 -y # install gsound for 'Pano Clipboard Manager'
         #cp -TRv ../../../ "${ZSH_CUSTOM:-$HOME/}"
 
-        cp -TR ../../../.config ~/.config
-        cp -TR ../../../.local ~/.local
         cp -TR ../../../.psensor ~/.psensor
         cp ../../../.bashrc ~/.bashrc
         cp ../../../.zshrc ~/.zshrc
         cp ../../../.p10k.zsh ~/.p10k.zsh
+        cp -TR ../../../.config ~/.config
+
+        # shellcheck disable=SC1091
+        if [ -f "/etc/os-release" ]; then
+            . /etc/os-release
+            OS=$NAME
+
+            if [ "$OS" == "Ubuntu" ]; then
+                cp -TR ../../../ubuntu/.config ~/.config
+                cp -TR ../../../ubuntu/.local ~/.local
+            elif [ "$OS" == "Zorin OS" ]; then
+                cp -TR ../../../zorin/.config ~/.config
+                cp -TR ../../../zorin/.local ~/.local
+            fi
+        fi
 
         break
         ;;