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

Integrate BINDIR

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-13 14:32:19 -05:00
parent 4fd858d635
commit 36d392c2f2
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openwrtbuilder
View File

@@ -443,15 +443,15 @@ makeImage() {
debug "${FUNCNAME[0]}" debug "${FUNCNAME[0]}"
# Reuse the existing output # Reuse the existing output
if [[ -d "$BUILDDIR" ]]; then if [[ -d "$BINDIR" ]]; then
if askOk "$BUILDDIR exists. Rebuild?"; then if askOk "$BINDIR exists. Rebuild?"; then
rm -rf "$BUILDDIR" rm -rf "$BINDIR"
else else
return 0 return 0
fi fi
fi fi
[[ ! -d "$BUILDDIR" ]] && mkdir -p "$BUILDDIR" [[ -d "$BUILDDIR" ]] || mkdir -p "$BUILDDIR"
if ! make image \ if ! make image \
BIN_DIR="$BINDIR" \ BIN_DIR="$BINDIR" \
@@ -460,7 +460,7 @@ makeImage() {
FILES="${FILESDIR}" \ FILES="${FILESDIR}" \
--directory="$BUILDDIR" \ --directory="$BUILDDIR" \
--jobs="$(nproc)" \ --jobs="$(nproc)" \
> make.log; then > "$BUILDDIR/make.log"; then
echo "Make image failed!" echo "Make image failed!"
exit 1 exit 1
fi fi
@@ -477,7 +477,7 @@ flashImage() {
exit 1 exit 1
fi fi
# TODO Roughly chooses the correct image # TODO Roughly choose the correct image
if [[ -f "$FACTORYIMGGZ" ]]; then if [[ -f "$FACTORYIMGGZ" ]]; then
img_gz="$FACTORYIMGGZ" img_gz="$FACTORYIMGGZ"
img="$FACTORYIMG" img="$FACTORYIMG"