new welcome screen

diff --git a/archinstall.sh b/archinstall.sh
index 3d50f25..aca8830 100755 (executable)
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -96,8 +96,12 @@ chmod +x */*.sh
 cd /root/instantARCH
 
 ./ask.sh || {
-    imenu -m "ask failed"
-    echo "ask failed" && exit
+    if ! [ -e /opt/instantos/installcanceled ]; then
+        imenu -m "ask failed"
+        echo "ask failed" && exit
+    else
+        exit
+    fi
 }
 
 chmod +x *.sh

diff --git a/ask.sh b/ask.sh
index d2e79aa..07fe649 100755 (executable)
--- a/ask.sh
+++ b/ask.sh
@@ -24,10 +24,18 @@ 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 arrow keys' -i -l 209 -h -1 -bw 8 -a 60 -w -1 -c)"
+    if grep -iq cancel <<<"$NEXTCHOICE"; then
+        mkdir /opt/instantos
+        touch /opt/instantos/installcanceled
+        exit 1
+    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