summaryrefslogtreecommitdiff
path: root/archinstall.sh
diff options
context:
space:
mode:
authorxengineering <mail2xengineering@protonmail.com>2020-03-19 09:54:42 +0100
committerxengineering <mail2xengineering@protonmail.com>2020-03-19 09:54:42 +0100
commitf7b814cf07d3b4adeda18cbd783dc7b6f7af8250 (patch)
tree11ff13ec38a1ff91ec926aedc04fe396e69f6323 /archinstall.sh
parent88c4d809d7568bc1524ede14f522c191b33a5f29 (diff)
downloadarchinstall-f7b814cf07d3b4adeda18cbd783dc7b6f7af8250.tar
archinstall-f7b814cf07d3b4adeda18cbd783dc7b6f7af8250.tar.zst
archinstall-f7b814cf07d3b4adeda18cbd783dc7b6f7af8250.zip
Switched to coloured Output
Diffstat (limited to 'archinstall.sh')
-rw-r--r--archinstall.sh16
1 files changed, 7 insertions, 9 deletions
diff --git a/archinstall.sh b/archinstall.sh
index 3a89d5b..7caa6dd 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -62,8 +62,8 @@ export FIRST_STAGE_LINK="https://raw.githubusercontent.com/xengineering/archinst
export SECOND_STAGE_LINK="https://raw.githubusercontent.com/xengineering/archinstall/$BRANCH/stages/second_stage.sh"
export PACKAGE_LIST="base linux linux-firmware grub networkmanager nano" # maybe this is requiered: efibootmgr
export DEFAULT_PASSWORD="archinstall"
-export OK="\033[m[ \033[32mOK\033[m ]"
-export ERROR="\033[m[ \033[32mERROR\033[m ]"
+export OK="\033[m[ \033[32mOK\033[m ]"
+export ERROR="\033[m[ \033[31mERROR\033[m ]"
# Variables
@@ -82,26 +82,23 @@ export hostname="archlinux" # will be set to a user-chosen hostname
if ping -w $INTERNET_TEST_PING_TIMEOUT -c 1 $INTERNET_TEST_SERVER; then
printf "$OK Internet connection is ready\n"
- printf "$ERROR An error would look like this\n"
- echo ""
else
- echo "Could not reach INTERNET_TEST_SERVER '$INTERNET_TEST_SERVER' - FAILED"
- exit
+ printf "$ERROR Could not reach INTERNET_TEST_SERVER '$INTERNET_TEST_SERVER'\n"
+ exit 1
fi
-exit 99
-
-
# Update the system clock
timedatectl set-ntp true
+printf "$OK Updated system clock\n"
# Download and run first stage
curl $FIRST_STAGE_LINK > /root/first_stage.sh
bash /root/first_stage.sh
+printf "$OK first_stage.sh finished\n"
# Download, run and delete second stage
@@ -109,3 +106,4 @@ bash /root/first_stage.sh
curl $SECOND_STAGE_LINK > /mnt/root/second_stage.sh
echo "bash /root/second_stage.sh" | arch-chroot /mnt
rm /mnt/root/second_stage.sh
+printf "$OK second_stage.sh finished\n"