From cf292cac6d1ac3f9cfe21e7c8f19687e33ba1b39 Mon Sep 17 00:00:00 2001 From: anntnzrb Date: Mon, 27 Jun 2022 16:06:35 -0500 Subject: [PATCH 1/2] git clone wrapper for minimal & silent clones - Removed a few `>/dev/null 2>&1`'s in favour of `git clone -q` --- larbs.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/larbs.sh b/larbs.sh index 622902a..b6e29e4 100755 --- a/larbs.sh +++ b/larbs.sh @@ -23,6 +23,11 @@ esac done installpkg(){ pacman --noconfirm --needed -S "$1" >/dev/null 2>&1 ;} +gitclonefast() { + # Wrapper around `git clone` for minimal and silent clone. + git clone --depth 1 --single-branch --no-tags -q "${@}" +} + error() { printf "%s\n" "$1" >&2; exit 1; } welcomemsg() { \ @@ -100,8 +105,8 @@ manualinstall() { # Installs $1 manually. Used only for AUR helper here. # Should be run after repodir is created and var is set. dialog --infobox "Installing \"$1\", an AUR helper..." 4 50 sudo -u "$name" mkdir -p "$repodir/$1" - sudo -u "$name" git clone --depth 1 "https://aur.archlinux.org/$1.git" "$repodir/$1" >/dev/null 2>&1 || - { cd "$repodir/$1" || return 1 ; sudo -u "$name" git pull --force origin master;} + sudo -u "$name" gitclonefast "https://aur.archlinux.org/$1.git" "$repodir/$1" \ + || { cd "$repodir/$1" || return 1 ; sudo -u "$name" git pull --force origin master;} cd "$repodir/$1" sudo -u "$name" -D "$repodir/$1" makepkg --noconfirm -si >/dev/null 2>&1 || return 1 } @@ -115,7 +120,7 @@ gitmakeinstall() { progname="$(basename "$1" .git)" 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 --depth 1 "$1" "$dir" >/dev/null 2>&1 || { cd "$dir" || return 1 ; sudo -u "$name" git pull --force origin master;} + sudo -u "$name" gitclonefast "$1" "$dir" || { cd "$dir" || return 1 ; sudo -u "$name" git pull --force origin master;} cd "$dir" || exit 1 make >/dev/null 2>&1 make install >/dev/null 2>&1 @@ -154,7 +159,7 @@ putgitrepo() { # Downloads a gitrepo $1 and places the files in $2 only overwrit dir=$(mktemp -d) [ ! -d "$2" ] && mkdir -p "$2" chown "$name":wheel "$dir" "$2" - sudo -u "$name" git clone --recursive -b "$branch" --depth 1 --recurse-submodules "$1" "$dir" >/dev/null 2>&1 + sudo -u "$name" gitclonefast --recursive -b "$branch" --recurse-submodules "$1" "$dir" sudo -u "$name" cp -rfT "$dir" "$2" } From 8f62521383f6c76871b9fb32e8cceeb43e9d3239 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 28 Jun 2022 09:41:32 -0400 Subject: [PATCH 2/2] lol --- larbs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/larbs.sh b/larbs.sh index 664c28e..b581fb7 100755 --- a/larbs.sh +++ b/larbs.sh @@ -98,7 +98,7 @@ manualinstall() { # Installs $1 manually. Used only for AUR helper here. dialog --infobox "Installing \"$1\", an AUR helper..." 4 50 sudo -u "$name" mkdir -p "$repodir/$1" sudo -u "$name" gitclonefast "https://aur.archlinux.org/$1.git" "$repodir/$1" \ - || { cd "$repodir/$1" || return 1 ; sudo -u "$name" git pull --force origin master;} + || { cd "$repodir/$1" || return 1 ; sudo -u "$name" git pull --force origin master ;} cd "$repodir/$1" || exit 1 sudo -u "$name" -D "$repodir/$1" makepkg --noconfirm -si >/dev/null 2>&1 || return 1 } @@ -112,7 +112,7 @@ gitmakeinstall() { progname="$(basename "$1" .git)" 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" gitclonefast "$1" "$dir" || { cd "$dir" || return 1 ; sudo -u "$name" git pull --force origin master;} + sudo -u "$name" gitclonefast "$1" "$dir" || { cd "$dir" || return 1 ; sudo -u "$name" git pull --force origin master ;} cd "$dir" || exit 1 make >/dev/null 2>&1 make install >/dev/null 2>&1