fix mirrorlist generator

[instantos/instantARCH.git] / systeminstall.sh

diff --git a/systeminstall.sh b/systeminstall.sh
index c1e0a10..d52dd11 100755 (executable)
--- a/systeminstall.sh
+++ b/systeminstall.sh
@@ -1,66 +1,20 @@
 #!/bin/bash
 
-# reset working dir
-rcd() {
-    cd /root/instantARCH
-}
+source /root/instantARCH/installutils.sh
 
-serror() {
-    if [ -e /opt/noerror ]; then
-        echo "skipping error"
-        rm /opt/noerror
-    else
-        echo "script failed"
-        exit 1
-    fi
-}
-
-setinfo() {
-    if [ -e /usr/share/liveutils ]; then
-        pkill instantmenu
-    fi
-    echo "$@" >/opt/instantprogress
-}
-
-escript() {
-    setinfo "${2:-info}"
-    rcd
-    ./$1.sh || serror
-    echo "$1" >>/tmp/instantprogress
-}
-
-# scripts executed in installed environment
-chrootscript() {
-    setinfo "${2:-info}"
-    if ! mount | grep -q '/mnt.*ext4'; then
-        echo "mount failed"
-        exit 1
-    fi
-
-    rcd
-
-    if command -v arch-chroot; then
-        arch-chroot /mnt "/root/instantARCH/${1}.sh" || serror
-    else
-        manjaro-chroot /mnt "/root/instantARCH/${1}.sh" || serror
-    fi
-
-    echo "chroot: $1" >>/tmp/instantprogress
-
-}
-
-chrootscript "depend/depend" "preparing installer packages" &&
-    chrootscript "depend/depend" "preparing installer packages" &&
-    chrootscript "depend/system" "installing dependencies" &&
-    chrootscript "chroot/chroot" "configuring system" &&
-    chrootscript "chroot/drivers" "installing drivers" &&
-    chrootscript "lang/timezone" "settings time"
+chrootscript "depend/depend" "preparing installer packages"
+chrootscript "depend/depend" "preparing installer packages"
+chrootscript "artix/preinstall" "applying artix fixes"
+chrootscript "depend/system" "installing dependencies"
+chrootscript "chroot/chroot" "configuring system"
+chrootscript "chroot/drivers" "installing drivers"
+chrootscript "lang/timezone" "settings time"
 
 # grub: install package, install, generate config
 if efibootmgr; then
     chrootscript "bootloader/efi" "installing bootloader"
 else
-    escript bootloader/install "installing bootloader"
+    chrootscript "bootloader/install" "installing bootloader"
 fi
 
 chrootscript "user/user" "setting up user" &&
@@ -72,10 +26,16 @@ chrootscript "lang/locale" "setting locale"
 [ -e /opt/noerror ] && rm /opt/noerror
 
 # make instantOS packages optional
-if ! [ -e /root/instantARCH/config/onlyarch ] &&
+if ! iroot onlyarch &&
     ! [ -e /opt/onlyarch ]; then
     chrootscript "instantos/install" "configuring instantOS, this will take a while"
+    if grep -iq 'manjaro' /etc/os-release; then
+        echo "manjaro extra steps"
+        chrootscript "chroot/chroot" "extra steps for manjaro"
+    fi
 fi
 
+chrootscript "artix/postinstall" "checking for reverting artix fixes"
+
 # mark installation as susccessful
 touch /opt/installsuccess