Build directory name

src/freedombone-image

@@ -64,7 +64,7 @@ IMAGE_TYPE='beagleboneblack'
 CURR_DIR=$(pwd)
 CURR_USER="$USER"
 UNIQUE_ID=$(openssl rand -base64 32 | tr -dc A-Za-z0-9 | head -c 10 ; echo -n '')
-TEMPBUILD_DIR=~/.tmp_${PROJECT_NAME}_build_${UNIQUE_ID}
+TEMPBUILD_DIR=~/.tmp_${PROJECT_NAME}_build
 VMDEBOOTSTRAP_REPO=git://git.liw.fi/vmdebootstrap
 VMDEBOOTSTRAP_VERSION=0.8
 MAKEFILE=${PROJECT_NAME}-image-makefile
@@ -540,25 +540,6 @@ if [ -f "${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt" ]; then
     rm "${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt"
 fi
 
-if [ -d $TEMPBUILD_DIR ]; then
-    rm -rf $TEMPBUILD_DIR
-fi
-mkdir -p $TEMPBUILD_DIR
-if [ -f /usr/local/bin/$MAKEFILE ]; then
-    cp /usr/local/bin/$MAKEFILE $TEMPBUILD_DIR/Makefile
-else
-    cp /usr/bin/$MAKEFILE $TEMPBUILD_DIR/Makefile
-fi
-
-cp -r /etc/${PROJECT_NAME}/* $TEMPBUILD_DIR
-rm -rf $TEMPBUILD_DIR/vendor
-chown -R "$CURR_USER":"$CURR_USER" $TEMPBUILD_DIR
-cd $TEMPBUILD_DIR || exit 24729847
-
-if [[ $MINIMAL_INSTALL == "yes" ]]; then
-    IMAGE_NAME=$'min'
-fi
-
 if [[ $ONION_ONLY != "no" ]]; then
     IMAGE_NAME=$'onion'
 fi
@@ -599,6 +580,27 @@ if [[ "$SOCIALINSTANCE" == "gnusocial" || "$SOCIALINSTANCE" == "postactiv" || "$
     IMAGE_NAME="${IMAGE_NAME}-${SOCIALINSTANCE}"
 fi
 
+if [ "${IMAGE_NAME}" ]; then
+    TEMPBUILD_DIR=~/.tmp_${PROJECT_NAME}_build_${IMAGE_TYPE}-${IMAGE_NAME}
+else
+    TEMPBUILD_DIR=~/.tmp_${PROJECT_NAME}_build_${IMAGE_TYPE}
+fi
+
+if [ -d $TEMPBUILD_DIR ]; then
+    rm -rf $TEMPBUILD_DIR
+fi
+mkdir -p $TEMPBUILD_DIR
+if [ -f /usr/local/bin/$MAKEFILE ]; then
+    cp /usr/local/bin/$MAKEFILE $TEMPBUILD_DIR/Makefile
+else
+    cp /usr/bin/$MAKEFILE $TEMPBUILD_DIR/Makefile
+fi
+
+cp -r /etc/${PROJECT_NAME}/* $TEMPBUILD_DIR
+rm -rf $TEMPBUILD_DIR/vendor
+chown -R "$CURR_USER":"$CURR_USER" $TEMPBUILD_DIR
+cd $TEMPBUILD_DIR || exit 24729847
+
 cd $TEMPBUILD_DIR || exit 724245267
 make "$IMAGE_TYPE" \
      MYUSERNAME="$USERNAME" \