Merge pull request #467 from ryaeng/master
Minor changes to get things working again
This commit is contained in:
commit
b560b21599
4
larbs.sh
4
larbs.sh
@ -131,7 +131,7 @@ gitmakeinstall() {
|
||||
dir="$repodir/$progname"
|
||||
dialog --title "LARBS Installation" \
|
||||
--infobox "Installing \`$progname\` ($n of $total) via \`git\` and \`make\`. $(basename "$1") $2" 5 70
|
||||
sudo -u "$name" git clone -C "$repodir/$1" \
|
||||
sudo -u "$name" git -C "$repodir" clone \
|
||||
--depth 1 --single-branch --no-tags -q "$1" "$dir" \
|
||||
|| { cd "$dir" || return 1 ; sudo -u "$name" git pull --force origin master ;}
|
||||
cd "$dir" || exit 1
|
||||
@ -179,7 +179,7 @@ putgitrepo() {
|
||||
dir=$(mktemp -d)
|
||||
[ ! -d "$2" ] && mkdir -p "$2"
|
||||
chown "$name":wheel "$dir" "$2"
|
||||
sudo -u "$name" git -C "$repodir/$1" clone --depth 1 \
|
||||
sudo -u "$name" git -C "$repodir" clone --depth 1 \
|
||||
--single-branch --no-tags -q --recursive -b "$branch" \
|
||||
--recurse-submodules "$1" "$dir"
|
||||
sudo -u "$name" cp -rfT "$dir" "$2"
|
||||
|
Loading…
Reference in New Issue
Block a user