From fbfcd6ada6a80aa1b4dcdd5c287793fc0db839a6 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 8 Jan 2019 18:53:50 -0500 Subject: [PATCH] posix fix and error function added --- larbs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/larbs.sh b/larbs.sh index cdaa29d..f82efe1 100644 --- a/larbs.sh +++ b/larbs.sh @@ -14,13 +14,13 @@ while getopts ":a:r:p:h" o; do case "${o}" in esac done # DEFAULTS: -[ -z ${dotfilesrepo+x} ] && dotfilesrepo="https://github.com/lukesmithxyz/voidrice.git" -[ -z ${progsfile+x} ] && progsfile="https://raw.githubusercontent.com/LukeSmithxyz/LARBS/master/progs.csv" -[ -z ${aurhelper+x} ] && aurhelper="yay" +[ -z "$dotfilesrepo" ] && dotfilesrepo="https://github.com/lukesmithxyz/voidrice.git" +[ -z "$progsfile" ] && progsfile="https://raw.githubusercontent.com/LukeSmithxyz/LARBS/master/progs.csv" +[ -z "$aurhelper" ] && aurhelper="yay" ### FUNCTIONS ### -initialcheck() { pacman -Syyu --noconfirm --needed dialog || { echo "Are you sure you're running this as the root user? Are you sure you're using an Arch-based distro? ;-) Are you sure you have an internet connection? Are you sure your Arch keyring is updated?"; exit; } ;} +error() { clear; printf "ERROR:\\n%s\\n" "$1"; exit;} welcomemsg() { \ dialog --title "Welcome!" --msgbox "Welcome to Luke's Auto-Rice Bootstrapping Script!\\n\\nThis script will automatically install a fully-featured i3wm Arch Linux desktop, which I use as my main machine.\\n\\n-Luke" 10 60