fix status messages

diff --git a/archinstall.sh b/archinstall.sh
index df5f216..c477e93 100755 (executable)
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -11,14 +11,21 @@
 
 if [ -e /usr/share/liveutils ]; then
     imenu -m "preparing installation" &
+else
+    # print logo
+    echo ""
+    echo ""
+    curl -s 'https://raw.githubusercontent.com/instantOS/instantLOGO/master/ascii.txt' | sed 's/^/    /g'
+    echo ""
+    echo ""
 fi
 
-# print logo
-echo ""
-echo ""
-curl -s 'https://raw.githubusercontent.com/instantOS/instantLOGO/master/ascii.txt' | sed 's/^/    /g'
-echo ""
-echo ""
+setinfo() {
+    if [ -e /usr/share/liveutils ]; then
+        pkill instantmenu
+    fi
+    echo "$@" >/opt/instantprogress
+}
 
 # sort mirrors
 pacman -Sy --noconfirm
@@ -47,4 +54,4 @@ echo "local install"
 echo "in-system install"
 ./systeminstall.sh
 
-echo "done installing arch linux"
+echo "installation finished"

diff --git a/depend/depend.sh b/depend/depend.sh
index 55ae18c..f0dbeff 100755 (executable)
--- a/depend/depend.sh
+++ b/depend/depend.sh
@@ -9,6 +9,15 @@ pacman -Sy --noconfirm
 
 echo "downloading installer dependencies"
 
+setinfo() {
+    if [ -e /usr/share/liveutils ]; then
+        pkill instantmenu
+    fi
+    echo "$@" >/opt/instantprogress
+}
+
+setinfo "downloading installer dependencies"
+
 while ! pacman -S --noconfirm --needed \
     fzf \
     expect \

diff --git a/localinstall.sh b/localinstall.sh
index 5d6528f..ff274e4 100755 (executable)
--- a/localinstall.sh
+++ b/localinstall.sh
@@ -4,13 +4,21 @@ rcd() {
     cd /root/instantARCH
 }
 
+setinfo() {
+    if [ -e /usr/share/liveutils ]; then
+        pkill instantmenu
+    fi
+    echo "$@" >/opt/instantprogress
+}
+
 escript() {
+    setinfo "$2"
     rcd
     ./$1.sh
     echo "$1" >>/tmp/instantprogress
 }
 
-escript init/init
-escript disk/disk
-escript pacstrap/pacstrap
+escript init/init "configuring time"
+escript disk/disk "partitioning disk"
+escript pacstrap/pacstrap "installing base packages"
 sleep 1

diff --git a/systeminstall.sh b/systeminstall.sh
index b27c660..70eae9b 100755 (executable)
--- a/systeminstall.sh
+++ b/systeminstall.sh
@@ -18,14 +18,15 @@ setinfo() {
 }
 
 escript() {
+    setinfo "${2:-info}"
     rcd
     ./$1.sh || serror
     echo "$1" >>/tmp/instantprogress
-    setinfo "${2:-info}"
 }
 
 # scripts executed in installed environment
 chrootscript() {
+    setinfo "${2:-info}"
     if ! mount | grep -q '/mnt.*ext4'; then
         echo "mount failed"
         exit 1
@@ -34,7 +35,6 @@ chrootscript() {
     rcd
     arch-chroot /mnt "/root/instantARCH/${1}.sh" || serror
     echo "chroot: $1" >>/tmp/instantprogress
-    setinfo "${2:-info}"
 }
 
 chrootscript "depend/depend" "preparing installer packages" &&