diff --git a/backup-raveos.sh b/backup-raveos.sh index 6a17f07..13e6663 100644 --- a/backup-raveos.sh +++ b/backup-raveos.sh @@ -107,11 +107,11 @@ if [[ $user_choice = *"BACKUP All of My Data and Settings"* ]]; then if [[ $Desktop == GNOME ]]; then # GNOME SECTION - echo ${bold}${yellow}GNOME Detected - Updating GNOME Program Pkg${normal} + echo ${bold}${yellow}GNOME Detected - Dumping Dconf${normal} dconf dump / > $FOLDER/$USER-ui else # KDE Section - echo ${bold}${yellow}KDE Detected - Updating GNOME Program Pkg${normal} + echo ${bold}${yellow}KDE Detected - Saving Konsave${normal} konsave -s raveui-kde -f rsync -ap --info=progress2 /home/$USER/.config/konsave $FOLDER/.config mkdir -p $FOLDER/.local/state @@ -124,23 +124,30 @@ if [[ $user_choice = *"BACKUP All of My Data and Settings"* ]]; then fi if [[ $user_choice = *"Restore all of my data and settings"* ]]; then - Locale=$(locale | grep "LANG" -c) + Locale=$(locale | grep "LANG") Desktop=$XDG_CURRENT_DESKTOP echo echo ----------------------------------------------------- echo Copying ${bold}${yellow}Restoring $USER Settings and Files ${normal} into ${bold}${yellow}$FOLDER/${normal} - - rsync -ap --info=progress2 $FOLDER /home/$USER/ + sudo rsync -ap --info=progress2 $FOLDER/etc/libvirt /etc/ sudo rsync -ap --info=progress2 $FOLDER/usr/share/jellyfin/web/config.json /usr/share/jellyfin/web/ - rsync -ap --info=progress2 $FOLDER/.local/state/dolphinstaterc /home/$USER/.local/state/ - dconf load / < $FOLDER/$USER-ui - konsave -a raveui-kde + rsync -ap --info=progress2 $FOLDER /home/$USER/ + if [[ $Desktop == GNOME ]]; then + # GNOME SECTION + echo ${bold}${yellow}GNOME Detected - Loading Dconf${normal} + dconf load / < $FOLDER/$USER-ui + else + # KDE Section + echo ${bold}${yellow}KDE Detected - Loading Konsave${normal} + rsync -ap --info=progress2 $FOLDER/.local/state/dolphinstaterc /home/$USER/.local/state/ + konsave -a raveui-kde + fi echo ----------------------------------------------------- sudo chown -R $USER:$GROUP /home/$USER/ echo echo ${bold}${yellow}$USER settings RESTORED! ${normal} fi -exit \ No newline at end of file +exit 1 \ No newline at end of file