Commit 2.5.1

.install/setup.sh

@@ -1,7 +1,7 @@
 # ------------------------------------------------------
 # Setup
 # ------------------------------------------------------
-
+echo -e "${GREEN}"
 cat <<"EOF"
  ____       _               
 / ___|  ___| |_ _   _ _ __  
@@ -11,25 +11,31 @@ cat <<"EOF"
                      |_|    
 
 EOF
-echo "If you could restore your keyboard layout in the step before you can select Nn and skip."
-while true; do
-    read -p "Do you want to start the setup (Yy/Nn): " yn
-    case $yn in
-        [Yy]* )
-            read -p "Enter your preferred keyboard layout (us,de,...) (default:us): " keyboard
-            if [ -z "$keyboard" ]; then
-                keyboard="us"
-            fi
-            SEARCH="kb_layout = us"
-            REPLACE="kb_layout = $keyboard"
-            sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
+echo -e "${NONE}"
+if [ "$restored" == "1" ]; then
+    echo "You have already restored your settings into the new installation."
+else
+    while true; do
+        read -p "Do you want to set your keyboard layout? (Yy/Nn): " yn
+        case $yn in
+            [Yy]* )
+                read -p "Enter your preferred keyboard layout (us,de,...) (default:us): " keyboard
+                if [ -z "$keyboard" ]; then
+                    keyboard="us"
+                fi
 
-            SEARCH="keyboard_layout = \"us\""
-            REPLACE="keyboard_layout = \"$keyboard\""
-            sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/qtile/conf/keyboard.py
-        break;;
-        [Nn]* ) 
-        break;;
-        * ) echo "Please answer yes or no.";;
-    esac
-done
+                SEARCH="kb_layout = us"
+                REPLACE="kb_layout = $keyboard"
+                sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
+
+                SEARCH="keyboard_layout = \"us\""
+                REPLACE="keyboard_layout = \"$keyboard\""
+                sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/qtile/conf/keyboard.py
+            break;;
+            [Nn]* ) 
+            break;;
+            * ) echo "Please answer yes or no.";;
+        esac
+    done
+fi
+echo ""