diff --git a/.install/restore.sh b/.install/restore.sh index cc3d6bc..5149141 100755 --- a/.install/restore.sh +++ b/.install/restore.sh @@ -8,7 +8,7 @@ monitorrestored=0 _showRestoreOptions() { echo "The following configurations can be transferred into the new installation." - echo "(SPACE = select/unselect a profile. RETURN = confirm. No selection = CANCEL)" + echo "(SPACE = select/unselect a profile. RETURN = confirm. ESC/No selection = Skip Restore)" echo "" restorelist="" if [ -f ~/dotfiles/.bashrc ]; then @@ -75,18 +75,18 @@ _showRestoreOptions() { echo "Selected to restore:" echo "$restoreselect" echo "" - confirmrestore=$(gum choose "Start restore" "Change restore" "Cancel restore") + confirmrestore=$(gum choose "Start restore" "Change restore" "Skip restore") if [ "$confirmrestore" == "Start restore" ] ;then _startRestore elif [ "$confirmrestore" == "Change restore" ]; then _showRestoreOptions else - echo "Restore skipped." + echo ":: Restore skipped." return 0 fi else echo "No files selected to restore." - confirmrestore=$(gum choose "Change restore" "Cancel restore") + confirmrestore=$(gum choose "Change restore" "Skip restore") if [ -z "${confirmrestore}" ] ;then echo "Installation canceled." exit @@ -95,7 +95,7 @@ _showRestoreOptions() { echo "" _showRestoreOptions else - echo "Restore skipped." + echo ":: Restore skipped." return 0 fi fi @@ -110,7 +110,7 @@ _startRestore() { fi if [[ $restoreselect == *"~/dotfiles/.settings"* ]] || [[ $restoreselect == *"All"* ]] ; then if [ -d ~/dotfiles/.settings ]; then - rsync -a -I ~/dotfiles/.settings/ ~/dotfiles-versions/$version/.settings/ + rsync -avhp -I ~/dotfiles/.settings/ ~/dotfiles-versions/$version/.settings/ echo ":: .settings restored!" fi fi @@ -189,15 +189,14 @@ _startRestore() { } if [ -d ~/dotfiles ]; then - -echo -e "${GREEN}" -figlet "Restore" -echo -e "${NONE}" - restored=0 - echo "The script will try to restore existing configurations." - echo "PLEASE NOTE: Restoring is not possible with version < 2.6 of the dotfiles." - echo "In that case, please use the automated backup or create your own backup manually." - echo "" - _showRestoreOptions - echo "" + echo -e "${GREEN}" + figlet "Restore" + echo -e "${NONE}" + restored=0 + echo "The script will try to restore existing configurations." + echo "PLEASE NOTE: Restoring is not possible with version < 2.6 of the dotfiles." + echo "In that case, please use the automated backup or create your own backup manually." + echo "" + _showRestoreOptions + echo "" fi diff --git a/.install/settings.sh b/.install/settings.sh index 53f78e6..3daf5ea 100644 --- a/.install/settings.sh +++ b/.install/settings.sh @@ -1,4 +1,15 @@ -echo -e "${GREEN}" -figlet "Restore Settings" -echo -e "${NONE}" -python .install/restore.py \ No newline at end of file +if [ "$restored" == "1" ]; then + echo -e "${GREEN}" + figlet "Restore Settings" + echo -e "${NONE}" + python .install/restore.py +else + if [ -f ~/dotfiles/.settings/settings.json ] ;then + rm ~/dotfiles/.settings/settings.json + echo ":: settings.json removed" + fi + if [ -f ~/.cache/.themestyle.sh ] ;then + rm ~/.cache/.themestyle.sh + echo ":: .themestyle.sh removed" + fi +fi \ No newline at end of file diff --git a/.version/name b/.version/name index b946788..642c63c 100644 --- a/.version/name +++ b/.version/name @@ -1 +1 @@ -2.8.3RC2 \ No newline at end of file +2.8.3 \ No newline at end of file diff --git a/README.md b/README.md index b2d677c..cf53b73 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ML4W dotfiles 2.8.3 RC2 +# ML4W dotfiles 2.8.3 RC3 An advanced configuration of Hyprland and Qtile for Arch Linux based distributions. This package includes an installation script to install and setup the required components.