fix flatpak opener

[instantos/instantARCH.git] / ask.sh

diff --git a/ask.sh b/ask.sh
index af573aa..35dc3ca 100755 (executable)
--- a/ask.sh
+++ b/ask.sh
@@ -15,7 +15,7 @@ pb dialog
 
 source /root/instantARCH/askutils.sh
 
-if [ -e /usr/share/liveutils ]; then
+if [ -e /usr/share/liveutils ] && ! [ -e /tmp/nogui ]; then
     echo "GUI Mode active"
     export GUIMODE="True"
     GUIMODE="True"
@@ -24,10 +24,25 @@ fi
 # switch imenu to fzf and dialog
 if ! guimode; then
     touch /tmp/climenu
+    imenu -m "Welcome to the instantOS installer"
+else
+    NEXTCHOICE="$(echo '>>h              Welcome to the instantOS installer
+:g Next
+:r ﰸCancel' | instantmenu -q 'select using the mouse, keywords and arrow keys' -i -l 209 -h -1 -bw 8 -a 60 -w -1 -c)"
+
+    if grep -iq 'cancel' <<<"$NEXTCHOICE"; then
+        echo "canceling installation"
+        mkdir /opt/instantos
+        touch /opt/instantos/installcanceled
+        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
 
-imenu -m "Welcome to the instantOS installer"
-
 # go back to the beginning if user isn't happy with settings
 # this loop wraps the rest of the installer
 while ! iroot confirm; do
@@ -38,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
 
@@ -80,7 +95,9 @@ this will delete all existing data" | imenu -C; then
     fi
 
     # choice between multiple nvidia drivers
-    askdrivers
+    if ! grep -iq manjaro /etc/os-release; then
+        askdrivers
+    fi
 
     # create user and add to groups
     askuser
@@ -91,13 +108,17 @@ this will delete all existing data" | imenu -C; then
 
     iroot hostname "$NEWHOSTNAME"
 
+    if imenu -c -i "edit advanced settings? (use only if you know what you're doing)"; then
+        /root/instantARCH/askadvanced.sh
+    fi
+
     wallstatus install
     SUMMARY="Installation Summary:"
 
     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"
@@ -113,6 +134,9 @@ GRUB: BIOS"
     SUMMARY="$SUMMARY
 Should installation proceed with these parameters?"
 
+    echo "summary:
+$SUMMARY"
+
     if imenu -C <<<"$SUMMARY"; then
         iroot confirm 1
     else
@@ -129,7 +153,8 @@ Should installation proceed with these parameters?"
 
 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'