unless -b is provided, always puts TAG and DATE in base

diff --git a/scripts/nightly-build.sh b/scripts/nightly-build.sh
index 9d1629e..fdcc2dd 100755 (executable)
--- a/scripts/nightly-build.sh
+++ b/scripts/nightly-build.sh
@@ -135,8 +135,8 @@ function main () {
     MAKETARGETS="$@"
 
     cd $ROOT
-    ### set BASE if unspecified, from TAG
-    [ -z "$BASE" ] && BASE=${TAG/HEAD/${DATE}}
+    ### set BASE from TAG, if unspecified
+    [ -z "$BASE" ] && BASE=${TAG}
 
     if [ -n "$EXITIFOLD" -a -d "$BASE" ] ; then
       echo "$COMMAND: -e : exits on existing base directory $BASE"
@@ -148,10 +148,7 @@ function main () {
     if [ -n "$USEOLD" ] ; then
       use_base $BASE
     else
-      # base is not the date, it's probably a tag or whatever
-      if [ "$BASE" != "$DATE" ] ; then
-        [ -d "$BASE" ] && BASE=${BASE}-${DATE}
-      fi
+      BASE=${BASE}--${DATE}
       create_base
     fi
     BUILD=$ROOT/$BASE