Integrate BINDIR

openwrtbuilder

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