start instantARCH markers

diff --git a/chroot/chroot.sh b/chroot/chroot.sh
index 72e188d..4ad9af5 100755 (executable)
--- a/chroot/chroot.sh
+++ b/chroot/chroot.sh
@@ -19,6 +19,8 @@ fi
 # fix gui not showing up
 sed -i 's/^#logind-check-graphical=.*/logind-check-graphical=true/' /etc/lightdm/lightdm.conf
 
+echo '# modified by instantARCH' >>/etc/lightdm/lightdm.conf
+
 # needed to get internet to work
 if ! [ -e /opt/topinstall ] && ! iroot partswap; then
     if command -v systemctl; then
@@ -28,13 +30,13 @@ if ! [ -e /opt/topinstall ] && ! iroot partswap; then
             {
                 echo "swapfc_enabled=1"
                 echo "swapfc_max_count=8"
-            } >> /etc/systemd/swap.conf
+            } >>/etc/systemd/swap.conf
         fi
     fi
 fi
 
 sed -i 's/# %wheel/%wheel/g' /etc/sudoers
-echo 'Defaults env_reset,pwfeedback' >> /etc/sudoers
+echo 'Defaults env_reset,pwfeedback' >>/etc/sudoers
 
 if command -v systemctl; then
     systemctl enable lightdm

diff --git a/instantos/install.sh b/instantos/install.sh
index 3fc3bff..2782b0e 100755 (executable)
--- a/instantos/install.sh
+++ b/instantos/install.sh
@@ -3,7 +3,7 @@
 # install all instantOS software
 # and apply instantOS specific changes and workarounds
 
-cd
+cd || exit 1
 
 [ -e instantOS ] && rm -rf instantOS
 
@@ -11,7 +11,8 @@ while ! git clone --depth 1 https://github.com/instantOS/instantOS; do
     imenu -m "pull failed, please connect to the internet"
 done
 
-cd instantOS
+cd instantOS || exit 1
+
 bash repo.sh
 pacman -Sy --noconfirm
 
@@ -38,7 +39,7 @@ fi
 
 yes | pacman -S libxft-bgra
 
-cd ~/instantOS
+cd ~/instantOS || exit 1
 
 # disable plymouth on artix
 if ! command -v systemctl || iroot noplymouth; then

diff --git a/lang/locale.sh b/lang/locale.sh
index 320007b..fc55bb1 100755 (executable)
--- a/lang/locale.sh
+++ b/lang/locale.sh
@@ -12,7 +12,9 @@ fi
 sed -i 's/^[^#].*//g' /etc/locale.gen
 cat "$INSTANTARCH"/data/lang/locale/"$(iroot locale)" >>/etc/locale.gen
 
-echo "" >>/etc/locale.gen
+echo "# modified by instantARCH
+
+" >>/etc/locale.gen
 sleep 0.3
 locale-gen
 

diff --git a/lang/xorg.sh b/lang/xorg.sh
index 88b4dbf..40aba49 100755 (executable)
--- a/lang/xorg.sh
+++ b/lang/xorg.sh
@@ -4,8 +4,8 @@
 
 KEYLANG=$(iroot keyboard)
 
-NEWXORG=$(tail -1 /root/instantARCH/data/lang/keyboard/$KEYLANG)
-NEWKEYMAP=$(head -1 /root/instantARCH/data/lang/keyboard/$KEYLANG)
+NEWXORG="$(tail -1 /root/instantARCH/data/lang/keyboard/"$KEYLANG")"
+NEWKEYMAP="$(head -1 /root/instantARCH/data/lang/keyboard/"$KEYLANG")"
 
 echo "setting keymap to $NEWXORG"
 

diff --git a/network/network.sh b/network/network.sh
index 0722a0c..5e139e8 100755 (executable)
--- a/network/network.sh
+++ b/network/network.sh
@@ -13,8 +13,13 @@ fi
 echo "$NEWHOSTNAME" >/etc/hostname
 
 echo "127.0.0.1 localhost" >/etc/hosts
-echo "::1 localhost" >>/etc/hosts
-echo "127.0.1.1 $NEWHOSTNAME.localdomain $NEWHOSTNAME" >>/etc/hosts
+
+{
+    echo "::1 localhost"
+    echo "127.0.1.1 $NEWHOSTNAME.localdomain $NEWHOSTNAME"
+    echo '# modified by instantARCH'
+} >>/etc/hosts
+
 pacman -S --noconfirm --needed networkmanager
 
 if command -v systemctl; then

diff --git a/pacstrap/pacstrap.sh b/pacstrap/pacstrap.sh
index 224f2ff..8f882ca 100755 (executable)
--- a/pacstrap/pacstrap.sh
+++ b/pacstrap/pacstrap.sh
@@ -45,6 +45,10 @@ else
     fstabgen -U /mnt >>/mnt/etc/fstab
 fi
 
-cd /root
+cd /root || exit 1
+
 cp -r ./instantARCH /mnt/root/instantARCH
-cat /etc/pacman.d/mirrorlist >/mnt/etc/pacman.d/mirrorlist
+{
+    cat /etc/pacman.d/mirrorlist
+    echo '# modified by instantARCH'
+} >/mnt/etc/pacman.d/mirrorlist

diff --git a/vm/guestadditions.sh b/vm/guestadditions.sh
index 9dfadf2..df205b4 100644 (file)
--- a/vm/guestadditions.sh
+++ b/vm/guestadditions.sh
@@ -10,7 +10,7 @@ echo "installing virtualbox guest additions. This will take some time.
 It is normal for the first reboot after the installation of guest additions to take longer. " | imenu -M &
 
 sleep 2
-cd /media/virtualbox
+cd /media/virtualbox || exit
 
 ./VBoxLinuxAdditions.run
 touch /opt/instantos/guestadditions