OSDN Git Service

fix installfailed
authorpaperbenni <paperbenni@gmail.com>
Tue, 30 Jun 2020 16:20:40 +0000 (18:20 +0200)
committerpaperbenni <paperbenni@gmail.com>
Tue, 30 Jun 2020 16:20:40 +0000 (18:20 +0200)
archinstall.sh
artix/postinstall.sh
systeminstall.sh

index 33776e8..3ec5c11 100755 (executable)
@@ -113,11 +113,12 @@ sudo pkill instantmenu
 sleep 2
 
 # ask to reboot, upload error data if install failed
-if ! [ -e /opt/installfailed ] || ! [ -e /opt/installsuccess ] &&
-    command -v installapplet; then
-    notify-send "rebooting"
-    sleep 2
-    reboot
+if ! [ -e /opt/installfailed ] || ! [ -e /opt/installsuccess ]; then
+    if command -v installapplet; then
+        notify-send "rebooting"
+        sleep 2
+        reboot
+    fi
 else
 
     echo "installaion failed"
index 07566ea..bb4fdad 100755 (executable)
@@ -5,10 +5,10 @@
 
 if command -v systemctl; then
     echo "skipping artix hooks"
-    exit
+    exit 0
 fi
 
-echo "reverting pacaman fixes"
+echo "reverting pacman fixes"
 sed -i '/Optional TrustAll/d' /etc/pacman.conf
 sleep 1
 
index c625e0a..d52dd11 100755 (executable)
@@ -35,7 +35,7 @@ if ! iroot onlyarch &&
     fi
 fi
 
-chrootscript "artix/postinstall" "reverting artix fixes"
+chrootscript "artix/postinstall" "checking for reverting artix fixes"
 
 # mark installation as susccessful
 touch /opt/installsuccess