From ca408ae6cea4f0983c86e113c10ff6d9a4614992 Mon Sep 17 00:00:00 2001 From: "Ryan C. England" Date: Fri, 1 Jul 2022 10:14:04 -0400 Subject: [PATCH] Chagne git parameter order for gitmakeinstall. Remove git repo from working directory in gitmakeinstall & putgitrepo --- larbs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/larbs.sh b/larbs.sh index 5170bf6..7b0042c 100755 --- a/larbs.sh +++ b/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"