Avoid duplicate build menu prompts
This commit is contained in:
@@ -263,8 +263,10 @@ install_bootstrap_packages() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ensure_repo() {
|
ensure_repo() {
|
||||||
WORKDIR="$(prompt "Repository directory" "$WORKDIR")"
|
if [[ "${AGRARIAN_PROMPTS_DONE:-0}" != "1" ]]; then
|
||||||
JOBS="$(prompt "Parallel build jobs" "$JOBS")"
|
WORKDIR="$(prompt "Repository directory" "$WORKDIR")"
|
||||||
|
JOBS="$(prompt "Parallel build jobs" "$JOBS")"
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -d "$WORKDIR/.git" ]]; then
|
if [[ -d "$WORKDIR/.git" ]]; then
|
||||||
ROOT="$WORKDIR"
|
ROOT="$WORKDIR"
|
||||||
@@ -294,6 +296,7 @@ reexec_from_checkout() {
|
|||||||
exec env \
|
exec env \
|
||||||
AGRARIAN_REEXECED=1 \
|
AGRARIAN_REEXECED=1 \
|
||||||
AGRARIAN_MENU_CHOICE="$MENU_CHOICE" \
|
AGRARIAN_MENU_CHOICE="$MENU_CHOICE" \
|
||||||
|
AGRARIAN_PROMPTS_DONE=1 \
|
||||||
BRANCH="$BRANCH" \
|
BRANCH="$BRANCH" \
|
||||||
WORKDIR="$WORKDIR" \
|
WORKDIR="$WORKDIR" \
|
||||||
JOBS="$JOBS" \
|
JOBS="$JOBS" \
|
||||||
|
|||||||
+2
-1
@@ -18,7 +18,8 @@ pull. Target-specific packages are installed after the checkout is current, so
|
|||||||
fresh dependency fixes on the selected branch are applied before the build.
|
fresh dependency fixes on the selected branch are applied before the build.
|
||||||
After updating the checkout, the launcher restarts itself from the checked-out
|
After updating the checkout, the launcher restarts itself from the checked-out
|
||||||
copy so the current branch version of the menu is used for package installation
|
copy so the current branch version of the menu is used for package installation
|
||||||
and build steps.
|
and build steps. The selected target, checkout directory, and job count are
|
||||||
|
preserved across that restart.
|
||||||
|
|
||||||
Quick Start
|
Quick Start
|
||||||
-----------
|
-----------
|
||||||
|
|||||||
Reference in New Issue
Block a user