diff --git a/0-preinstall.sh b/0-preinstall.sh index c409730..757a81d 100755 --- a/0-preinstall.sh +++ b/0-preinstall.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # shellcheck disable=SC1091,SC2001 # shellcheck source=./setup.conf SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" diff --git a/1-setup.sh b/1-setup.sh index edcb162..22c19e8 100755 --- a/1-setup.sh +++ b/1-setup.sh @@ -10,7 +10,7 @@ else echo "ERROR! Missing file: setup.conf" exit 0 fi - +logo echo "basic installations" install_pkg networkmanager dhclient reflector \ rsync arch-install-scripts \ diff --git a/2-user.sh b/2-user.sh index ab9882f..0e060c1 100755 --- a/2-user.sh +++ b/2-user.sh @@ -1,8 +1,5 @@ #!/usr/bin/env bash -# You can solve users running this script as root -# with this and then doing the same for the next for statement. -# However I will leave this up to you. # shellcheck disable=SC1091 # shellcheck source=./setup.conf SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" @@ -19,6 +16,9 @@ install_aur() { "$AURHELPER" -S --noconfirm --needed "$@" } +logo +title "Installing AUR helper" + cd "$HOME" || exit 0 case "$AURHELPER" in "yay") diff --git a/3-post-setup.sh b/3-post-setup.sh index fcdb956..fc53b6c 100755 --- a/3-post-setup.sh +++ b/3-post-setup.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # shellcheck disable=SC1091 # shellcheck source=./setup.conf SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" @@ -11,6 +12,8 @@ else exit 0 fi +logo +title "Post Install and cleaning" if [[ "$LAYOUT" -eq 1 || "$BOOTLOADER" =~ "grub" ]]; then echo -e "Installing CyberRe Grub theme..." THEME_DIR="/boot/grub/themes" diff --git a/archtitus.sh b/archtitus.sh index b8e3920..04f708f 100755 --- a/archtitus.sh +++ b/archtitus.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash + # shellcheck disable=SC1091 # shellcheck source=./setup.conf diff --git a/startup.sh b/startup.sh index f71c93b..bacc03a 100644 --- a/startup.sh +++ b/startup.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -# This script will ask users about their prefrences -# like disk, file system, timezone, keyboard layout, -# user name, password, etc. + # shellcheck disable=SC2207,SC2120 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"