bryan/openwrtbuilder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable pager for --yes mode

Browse Source
This commit is contained in:
Bryan Roessler
2023-07-20 09:35:49 -04:00
parent 3f4a3c7d7e
commit d2f17da948
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
openwrtbuilder
View File

@@ -543,7 +543,7 @@ fromSource() {
declare src_url="https://github.com/openwrt/openwrt.git" declare src_url="https://github.com/openwrt/openwrt.git"
declare seed_file="$GITWORKTREEDIR/.config" declare seed_file="$GITWORKTREEDIR/.config"
declare pkg kopt opt commit seed_file wt_cmd wt_commit declare pkg kopt opt commit seed_file wt_cmd wt_commit description
declare -a make_opts config_opts declare -a make_opts config_opts
echo "Building from source is under development" echo "Building from source is under development"
@@ -582,13 +582,23 @@ fromSource() {
;; ;;
esac esac
[[ -d "$GITWORKTREEDIR" ]] && rm -rf "$GITWORKTREEDIR"
execute "${wt_cmd[@]}" "$wt_commit" execute "${wt_cmd[@]}" "$wt_commit"
# Print commit information # Print commit information
commit=$(git -C "$GITWORKTREEDIR" rev-parse HEAD) commit=$(git -C "$GITWORKTREEDIR" rev-parse HEAD)
description=$(git -C "$GITWORKTREEDIR" describe)
echo "Current commit hash: $commit" echo "Current commit hash: $commit"
(( DEBUG )) && git -C "$GITWORKTREEDIR" log -1 echo "Git worktree description: $description"
(( DEBUG )) && git -C "$GITWORKTREEDIR" describe
if (( DEBUG )); then
if (( YES )); then
git --no-pager -C "$GITWORKTREEDIR" log -1
else
git -C "$GITWORKTREEDIR" log -1
fi
fi
# Enter worktree # Enter worktree
pushd "$GITWORKTREEDIR" || return 1 pushd "$GITWORKTREEDIR" || return 1