fix flatpak opener

[instantos/instantARCH.git] / ask.sh

diff --git a/ask.sh b/ask.sh
index 950c83f..35dc3ca 100755 (executable)
--- a/ask.sh
+++ b/ask.sh
@@ -37,6 +37,10 @@ else
         touch /opt/instantos/statuscanceled
         exit 1
     fi
+    if iroot installtest
+    then
+        imenu -m "WARNING: you're running a test version of the installer"
+    fi
 fi
 
 # go back to the beginning if user isn't happy with settings
@@ -49,9 +53,9 @@ while ! iroot confirm; do
     # ask for keyboard layout
     asklayout
     if head -1 /root/instantARCH/data/lang/keyboard/"$NEWKEY" | grep -q '[^ ][^ ]'; then
-        loadkeys $(head -1 /root/instantARCH/data/lang/keyboard/"$NEWKEY")
+        loadkeys "$(head -1 /root/instantARCH/data/lang/keyboard/"$NEWKEY")"
     fi
-    guimode && setxkbmap -layout $(tail -1 /root/instantARCH/data/lang/keyboard/"$NEWKEY")
+    guimode && setxkbmap -layout "$(tail -1 /root/instantARCH/data/lang/keyboard/"$NEWKEY")"
 
     asklocale
 
@@ -114,7 +118,7 @@ this will delete all existing data" | imenu -C; then
     addsum "Username" "user"
     addsum "Locale" "locale"
     addsum "Region" "region"
-    addsum "Nearest City" "city"
+    addsum "Subregion" "city"
     addsum "Keyboard layout" "keyboard"
     addsum "Target install drive" "disk"
     addsum "Hostname" "hostname"
@@ -149,7 +153,8 @@ $SUMMARY"
 
 done
 
-imenu -M <<<"The installation will now begin.
+imenu -M <<<'The installation will now begin.
 This could take a while.
+You can check install progress by clicking on "2" in the top right
 Keep the machine powered and connected to the internet. 
-After the installation, the machine will automatically reboot"
+After the installation, the machine will automatically reboot'