Marty/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

rename progsfile to pkgfiles

Browse source 
plural since it can be multiple files and pkg since the files
describe packages to install, rather than progs.
This commit is contained in:
Marty Oehme 2019-03-11 19:33:27 +01:00
parent 14105b56ba
commit c6487dba86
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.config/bootstrap/install.sh
View file

@ -6,14 +6,14 @@
### OPTIONS AND VARIABLES ### ### OPTIONS AND VARIABLES ###
# unset our temp variables, just in case they were used for something else in shell # 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 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 ;; 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 ;; r) dotfilesrepo=${OPTARG} && git ls-remote "$dotfilesrepo" || exit ;;
a) aurhelper=${OPTARG} ;; a) aurhelper=${OPTARG} ;;
f) progsfile=${OPTARG} ;; f) pkgfiles=${OPTARG} ;;
F) progsfile=${OPTARG} && exclusiveprogsfile=true ;; F) pkgfiles=${OPTARG} && exclusivepkgfiles=true ;;
t) targetdeployment=${OPTARG} ;; t) targetdeployment=${OPTARG} ;;
u) targetuser=${OPTARG} ;; u) targetuser=${OPTARG} ;;
U) targetuser=${OPTARG} && forceuser=true ;; 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 # append the default packages to whatever custom package csv links were passed in or
# only use the custom packages if forced with -F # 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 # 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 # 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 # installs each needed program the way required. Be sure to run this only after