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

Improve reset

Browse Source
This commit is contained in:
Bryan Roessler
2023-02-16 13:13:47 -05:00
parent 6953cdfc5e
commit 81cd5c0880
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
openwrtbuilder
View File

@@ -537,7 +537,6 @@ sshUpgrade() {
fromSource() { fromSource() {
debug "${FUNCNAME[0]}" debug "${FUNCNAME[0]}"
declare src_dir="$BUILDROOT/src/openwrt"
declare src_url="https://github.com/openwrt/openwrt.git" declare src_url="https://github.com/openwrt/openwrt.git"
declare pkg kopt opt commit seed_file wt_cmd declare pkg kopt opt commit seed_file wt_cmd
declare -a make_opts config_opts declare -a make_opts config_opts
@@ -545,20 +544,20 @@ fromSource() {
echo "Building from source is under development" echo "Building from source is under development"
# Update source code # Update source code
if [[ ! -d "$src_dir" ]]; then if [[ ! -d "$GITDIR" ]]; then
mkdir -p "$src_dir" mkdir -p "$GITDIR"
git clone "$src_url" "$src_dir" git clone "$src_url" "$GITDIR"
fi fi
git -C "$src_dir" pull git -C "$GITDIR" pull
debug "Current commit:" debug "Current commit:"
(( DEBUG )) && git -C "$src_dir" log -1 (( DEBUG )) && git -C "$GITDIR" log -1
(( DEBUG )) && git -C "$src_dir" describe (( DEBUG )) && git -C "$GITDIR" describe
commit=$(git -C "$src_dir" rev-parse HEAD) commit=$(git -C "$GITDIR" rev-parse HEAD)
debug "Current commit hash: $commit" debug "Current commit hash: $commit"
wt_cmd=(git -C "$src_dir" wt_cmd=(git -C "$GITDIR"
worktree add worktree add
--force --force
--detach --detach
@@ -728,9 +727,9 @@ main() {
# Allow --reset without a profile # Allow --reset without a profile
if (( RESET )) && [[ ${#PROFILES} -lt 1 ]]; then if (( RESET )) && [[ ${#PROFILES} -lt 1 ]]; then
askOk "Remove $BUILDROOT/src and $BUILDROOT/bin?" || exit $? for d in "$BUILDROOT/src" "$BUILDROOT/bin"; do
debug "rm -rf $BUILDROOT/src $BUILDROOT/bin" askOk "Remove $d?" && execute rm -rf "$d"
rm -rf "${BUILDROOT:?}/src" "${BUILDROOT:?}/bin" done
exit $? exit $?
fi fi
@@ -756,6 +755,7 @@ main() {
declare -g PROFILE="${P_ARR[profile]}" declare -g PROFILE="${P_ARR[profile]}"
declare -g PACKAGES="${P_ARR[packages]:-}" declare -g PACKAGES="${P_ARR[packages]:-}"
declare -g SOURCEDIR="$BUILDROOT/src/$profile/$RELEASE-src" declare -g SOURCEDIR="$BUILDROOT/src/$profile/$RELEASE-src"
declare -g GITDIR="$BUILDROOT/src/openwrt"
if (( RESET )); then if (( RESET )); then
for d in "$BUILDDIR" "$SOURCEDIR" "$BINDIR"; do for d in "$BUILDDIR" "$SOURCEDIR" "$BINDIR"; do
@@ -796,6 +796,8 @@ main() {
ALIAS (\$profile, \$P_ARR -- should match)=$profile, ${!P_ARR} ALIAS (\$profile, \$P_ARR -- should match)=$profile, ${!P_ARR}
BUILDROOT=$BUILDROOT BUILDROOT=$BUILDROOT
BUILDDIR=$BUILDDIR BUILDDIR=$BUILDDIR
GITDIR=$GITDIR
SOURCEDIR=$SOURCEDIR
BINDIR=$BINDIR BINDIR=$BINDIR
TARGET=$TARGET TARGET=$TARGET
PROFILE=$PROFILE PROFILE=$PROFILE