diff --git a/.config/bootstrap/install.sh b/.config/bootstrap/install.sh index e513efe..be7ca0c 100644 --- a/.config/bootstrap/install.sh +++ b/.config/bootstrap/install.sh @@ -6,14 +6,14 @@ ### OPTIONS AND VARIABLES ### # unset our temp variables, just in case they were used for something else in shell -unset progsfile dotfilesrepo targetuser targetpassword targetdeployment quietmode aurhelper +unset pkgfiles dotfilesrepo targetuser targetpassword targetdeployment quietmode aurhelper while getopts ":a:r:p:u:U:f:F:hq" o; do case "${o}" in h) printf "Optional arguments for custom use:\\n -r: Dotfiles repository (local file or url)\\n -p: Dependencies and programs csv (local file or url)\\n -a: AUR helper (must have pacman-like syntax)\\n -h: Show this message\\n" && exit ;; r) dotfilesrepo=${OPTARG} && git ls-remote "$dotfilesrepo" || exit ;; a) aurhelper=${OPTARG} ;; - f) progsfile=${OPTARG} ;; - F) progsfile=${OPTARG} && exclusiveprogsfile=true ;; + f) pkgfiles=${OPTARG} ;; + F) pkgfiles=${OPTARG} && exclusivepkgfiles=true ;; t) targetdeployment=${OPTARG} ;; u) targetuser=${OPTARG} ;; U) targetuser=${OPTARG} && forceuser=true ;; @@ -238,10 +238,10 @@ getpackagegrouplink $targetdeployment # append the default packages to whatever custom package csv links were passed in or # only use the custom packages if forced with -F -[ ! "$exclusiveprogsfile" ] && progsfile="$(curl -Ls $pkggroup | cat ) $progsfile" +[ ! "$exclusivepkgfiles" ] && pkgfiles="$(curl -Ls $pkggroup | cat ) $pkgfiles" # actually gather the individual package installation lines from the various links and files -gatherpackages $progsfile +gatherpackages $pkgfiles # The command that does all the installing. Reads the progs.csv file and # installs each needed program the way required. Be sure to run this only after