Alexander/LARBS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #467 from ryaeng/master

Browse Source 
Minor changes to get things working again
This commit is contained in:
Luke Smith 2022-07-01 11:17:13 -04:00 committed by GitHub
commit b560b21599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
larbs.sh
View File

@ -131,7 +131,7 @@ gitmakeinstall() {
dir="$repodir/$progname" dir="$repodir/$progname"
dialog --title "LARBS Installation" \ dialog --title "LARBS Installation" \
--infobox "Installing \`$progname\` ($n of $total) via \`git\` and \`make\`. $(basename "$1") $2" 5 70 --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" \ --depth 1 --single-branch --no-tags -q "$1" "$dir" \
|| { cd "$dir" || return 1 ; sudo -u "$name" git pull --force origin master ;} || { cd "$dir" || return 1 ; sudo -u "$name" git pull --force origin master ;}
cd "$dir" || exit 1 cd "$dir" || exit 1
@ -179,7 +179,7 @@ putgitrepo() {
dir=$(mktemp -d) dir=$(mktemp -d)
[ ! -d "$2" ] && mkdir -p "$2" [ ! -d "$2" ] && mkdir -p "$2"
chown "$name":wheel "$dir" "$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" \ --single-branch --no-tags -q --recursive -b "$branch" \
--recurse-submodules "$1" "$dir" --recurse-submodules "$1" "$dir"
sudo -u "$name" cp -rfT "$dir" "$2" sudo -u "$name" cp -rfT "$dir" "$2"