diff --git a/install.sh b/install.sh index bb3186b..abfe63d 100755 --- a/install.sh +++ b/install.sh @@ -12,10 +12,11 @@ DOTDIR="/var/lib/dotfiles" os_release_file=/etc/os-release if [[ ! -e "${os_release_file}" ]] ; then - 2>&1 printf "Could not find ${os_release_file}, exiting" + 2>&1 printf 'Could not find %, exiting' "${os_release_file}" exit 1 fi +# shellcheck source=/etc/os-release source "${os_release_file}" sudowrap() { @@ -37,7 +38,7 @@ install() { fi sudowrap pacman -S --needed --noconfirm "${package}" else - 2>&1 printf "Unsupported distro $NAME, exiting" + 2>&1 printf 'Unsupported distro %s, exiting' "$NAME" exit 1 fi } diff --git a/install_scripts/bootstrap.sh b/install_scripts/bootstrap.sh index 63e6ca1..be882ad 100755 --- a/install_scripts/bootstrap.sh +++ b/install_scripts/bootstrap.sh @@ -10,10 +10,10 @@ pacman -Sy --noconfirm git # yes its a partial upgrade, but thats just the live cd /root git clone --recursive https://code.hkoerber.de/hannes/dotfiles.git -./dotfiles/install_scripts/${host}.sh +./dotfiles/install_scripts/"${host}".sh mv /root/dotfiles /mnt/var/lib/dotfiles -read -p "> Ready for reboot. Press enter for shutdown, then remove the installation media and boot again " +read -rp "> Ready for reboot. Press enter for shutdown, then remove the installation media and boot again " poweroff