fix mirrorlist generator

[instantos/instantARCH.git] / localinstall.sh

diff --git a/localinstall.sh b/localinstall.sh
index ff274e4..f9700f1 100755 (executable)
--- a/localinstall.sh
+++ b/localinstall.sh
@@ -1,24 +1,10 @@
 #!/bin/bash
 
-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
-}
+source /root/instantARCH/installutils.sh
 
+escript depend/mirrors "configuring mirrors"
 escript init/init "configuring time"
 escript disk/disk "partitioning disk"
+escript disk/mount "mounting partitions"
 escript pacstrap/pacstrap "installing base packages"
-sleep 1
+sleep 0.5