confirm boxes

diff --git a/disk/disk.sh b/disk/disk.sh
index 2c30712..118b89f 100755 (executable)
--- a/disk/disk.sh
+++ b/disk/disk.sh
@@ -2,9 +2,17 @@
 
 # automatic disk partitioning
 
+source <(curl -Ls git.io/paperbash)
+pb dialog
+
 fdisk -l
 
-DISK=$(fdisk -l | grep -i '^Disk /.*:' | fzf --prompt "select disk")
+while [ -z "$DISK" ]; do
+    DISK=$(fdisk -l | grep -i '^Disk /.*:' | fzf --prompt "select disk")
+    if ! confirm "Install on $DISK ? this will delete all data on $DISK"; then
+        unset DISK
+    fi
+done
 
 grep -o '/dev/[^:]*' <<<"$DISK" >/root/instantdisk
 DISK=$(cat /root/instantdisk)

diff --git a/lang/locale.sh b/lang/locale.sh
index 7d34388..079be98 100644 (file)
--- a/lang/locale.sh
+++ b/lang/locale.sh
@@ -1,9 +1,18 @@
 #!/bin/bash
+source <(curl -Ls git.io/paperbash)
+pb dialog
 
-while [ -z "$NEWLOCALE" ]; do
-    NEWLOCALE=$(cat /etc/locale.gen | grep '^#[^ ]' | fzf --prompt 'select locale')
+while ! [ -e /tmp/localedone ]; do
+    while [ -z "$NEWLOCALE" ]; do
+        NEWLOCALE=$(cat /etc/locale.gen | grep '^#[^ ]' | fzf --prompt 'select locale')
+    done
+    NEWGEN=$(grep '[^#]*' <<<"$NEWLOCALE")
+    sed -i "s/$NEWLOCALE/$NEWGEN/g" /etc/locale.gen
+    if confirm "Add another locale?"; then
+        unset NEWLOCALE
+    else
+        touch /tmp/localedone
+    fi
 done
 
-NEWGEN=$(grep '[^#]*' <<<"$NEWLOCALE")
-sed -i "s/$NEWLOCALE/$NEWGEN/g" /etc/locale.gen
 locale-gen