NapoleonDynamite/LARBS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

branch fix and added to vl

Browse source
This commit is contained in:
Luke Smith 2019-05-18 16:47:15 -04:00
parent 6d5389c7d8
commit ea14797d14
No known key found for this signature in database
GPG key ID: 4C50B54A911F6252
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archi3/larbs.sh
View file

@ -122,7 +122,7 @@ installationloop() { \
putgitrepo() { # Downlods a gitrepo $1 and places the files in $2 only overwriting conflicts putgitrepo() { # Downlods a gitrepo $1 and places the files in $2 only overwriting conflicts
dialog --infobox "Downloading and installing config files..." 4 60 dialog --infobox "Downloading and installing config files..." 4 60
[ -z "$repobranch" ] && branch="master" || branch="$repobranch" [ -z "$3" ] && branch="master" || branch="$repobranch"
dir=$(mktemp -d) dir=$(mktemp -d)
[ ! -d "$2" ] && mkdir -p "$2" && chown -R "$name:wheel" "$2" [ ! -d "$2" ] && mkdir -p "$2" && chown -R "$name:wheel" "$2"
chown -R "$name:wheel" "$dir" chown -R "$name:wheel" "$dir"

9
voiddwm/vlarbs.sh
View file

@ -6,8 +6,9 @@
### OPTIONS AND VARIABLES ### ### OPTIONS AND VARIABLES ###
while getopts ":r:p:h" o; do case "${o}" in while getopts ":r:p:h" 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 -h: Show this message\\n" && exit ;; h) printf "Optional arguments for custom use:\\n -r: Dotfiles repository (local file or url)\\n -b: Dotfiles branch (master is assumed otherwise)\\n -p: Dependencies and programs csv (local file or url)\\n -h: Show this message\\n" && exit ;;
r) dotfilesrepo=${OPTARG} && git ls-remote "$dotfilesrepo" || exit ;; r) dotfilesrepo=${OPTARG} && git ls-remote "$dotfilesrepo" || exit ;;
b) repobranch=${OPTARG} ;;
p) progsfile=${OPTARG} ;; p) progsfile=${OPTARG} ;;
*) printf "Invalid option: -%s\\n" "$OPTARG" && exit ;; *) printf "Invalid option: -%s\\n" "$OPTARG" && exit ;;
esac done esac done
@ -15,6 +16,7 @@ esac done
# DEFAULTS: # DEFAULTS:
[ -z "$dotfilesrepo" ] && dotfilesrepo="https://github.com/lukesmithxyz/voidrice.git" [ -z "$dotfilesrepo" ] && dotfilesrepo="https://github.com/lukesmithxyz/voidrice.git"
[ -z "$progsfile" ] && progsfile="https://raw.githubusercontent.com/LukeSmithxyz/LARBS/master/progs.csv" [ -z "$progsfile" ] && progsfile="https://raw.githubusercontent.com/LukeSmithxyz/LARBS/master/progs.csv"
[ -z "$repobranch" ] && repobranch="master"
### FUNCTIONS ### ### FUNCTIONS ###
@ -90,11 +92,12 @@ installationloop() { \
done < /tmp/progs.csv ;} done < /tmp/progs.csv ;}
putgitrepo() { # Downlods a gitrepo $1 and places the files in $2 only overwriting conflicts putgitrepo() { # Downlods a gitrepo $1 and places the files in $2 only overwriting conflicts
[ -z "$3" ] && branch="master" || branch="$repobranch"
dialog --infobox "Downloading and installing config files..." 4 60 dialog --infobox "Downloading and installing config files..." 4 60
dir=$(mktemp -d) dir=$(mktemp -d)
[ ! -d "$2" ] && mkdir -p "$2" && chown -R "$name:wheel" "$2" [ ! -d "$2" ] && mkdir -p "$2" && chown -R "$name:wheel" "$2"
chown -R "$name:wheel" "$dir" chown -R "$name:wheel" "$dir"
sudo -u "$name" git clone --depth 1 "$1" "$dir/gitrepo" >/dev/null 2>&1 && sudo -u "$name" git clone -b "$branch" --depth 1 "$1" "$dir/gitrepo" >/dev/null 2>&1 &&
sudo -u "$name" cp -rfT "$dir/gitrepo" "$2" sudo -u "$name" cp -rfT "$dir/gitrepo" "$2"
} }
@ -147,7 +150,7 @@ xbps-install -y curl base-devel git >/dev/null 2>&1
installationloop installationloop
# Install the dotfiles in the user's home directory # Install the dotfiles in the user's home directory
putgitrepo "$dotfilesrepo" "/home/$name" putgitrepo "$dotfilesrepo" "/home/$name" "$repobranch"
rm -f "/home/$name/README.md" "/home/$name/LICENSE" rm -f "/home/$name/README.md" "/home/$name/LICENSE"
# Install vim `plugged` plugins. # Install vim `plugged` plugins.