From: Christian Hofstaedtler <ch@grml.org>
Date: Fri, 25 Nov 2011 07:00:10 +0000 (+0100)
Subject: buildd: create ISO_NAME in function.sh
X-Git-Tag: v0.17.0~76
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=8e7b216f054d8d36ccef614fd83df4f83fcde3bc

buildd: create ISO_NAME in function.sh
---

diff --git a/buildd/functions.sh b/buildd/functions.sh
index 64d8fe4..0600dfa 100755
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -20,13 +20,14 @@ which mutt >/dev/null 2>&1 || die "mutt binary not found. Exiting."
 [ -n "$SUITE" ]    || die "\$SUITE is not set. Exiting."
 [ -n "$CLASSES" ]  || die "\$CLASSES is not set. Exiting."
 [ -n "$NAME" ]     || die "\$NAME is not set. Exiting."
-[ -n "$ISO_NAME" ] || die "\$ISO_NAME is not set. Exiting."
+[ -n "$PRODUCT_NAME" ] || die "\$PRODUCT_NAME is not set. Exiting."
 
 # some defaults:
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
 DATE=$(date +'%Y%m%d_%H%M%S')
 TMP_DIR="$(mktemp -d)"
 [ -n "$TMP_DIR" ]      || die "Could not create \$TMP_DIR. Exiting."
+ISO_NAME="${PRODUCT_NAME}.iso"
 
 # make sure we have same safe defaults:
 [ -n "$OUTPUT_DIR" ]    || OUTPUT_DIR="${STORAGE}/grml-live_${DATE}.$$"
diff --git a/buildd/grml-live_autobuild_grml-medium_sid.sh b/buildd/grml-live_autobuild_grml-medium_sid.sh
index 1233ec6..a655255 100755
--- a/buildd/grml-live_autobuild_grml-medium_sid.sh
+++ b/buildd/grml-live_autobuild_grml-medium_sid.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml-medium_sid_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml-medium_sid_$SHORTDATE
 SUITE=sid
 CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,I386,IGNORE'
 NAME=grml-medium
diff --git a/buildd/grml-live_autobuild_grml-medium_squeeze.sh b/buildd/grml-live_autobuild_grml-medium_squeeze.sh
index 907eddb..7aacef2 100755
--- a/buildd/grml-live_autobuild_grml-medium_squeeze.sh
+++ b/buildd/grml-live_autobuild_grml-medium_squeeze.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml-medium_squeeze_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml-medium_squeeze_$SHORTDATE
 SUITE=squeeze
 CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,I386,IGNORE'
 NAME=grml-medium
diff --git a/buildd/grml-live_autobuild_grml-medium_wheezy.sh b/buildd/grml-live_autobuild_grml-medium_wheezy.sh
index 5e6abfd..76ff786 100755
--- a/buildd/grml-live_autobuild_grml-medium_wheezy.sh
+++ b/buildd/grml-live_autobuild_grml-medium_wheezy.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml-medium_wheezy_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml-medium_wheezy_$SHORTDATE
 SUITE=wheezy
 CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,I386,IGNORE'
 NAME=grml-medium
diff --git a/buildd/grml-live_autobuild_grml-small_sid.sh b/buildd/grml-live_autobuild_grml-small_sid.sh
index 387e157..0a283a8 100755
--- a/buildd/grml-live_autobuild_grml-small_sid.sh
+++ b/buildd/grml-live_autobuild_grml-small_sid.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml-small_sid_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml-small_sid_$SHORTDATE
 SUITE=sid
 CLASSES='GRMLBASE,GRML_SMALL,RELEASE,I386,IGNORE'
 NAME=grml-small
diff --git a/buildd/grml-live_autobuild_grml-small_squeeze.sh b/buildd/grml-live_autobuild_grml-small_squeeze.sh
index a851d12..44303ed 100755
--- a/buildd/grml-live_autobuild_grml-small_squeeze.sh
+++ b/buildd/grml-live_autobuild_grml-small_squeeze.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml-small_squeeze_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml-small_squeeze_$SHORTDATE
 SUITE=squeeze
 CLASSES='GRMLBASE,GRML_SMALL,RELEASE,I386,IGNORE'
 NAME=grml-small
diff --git a/buildd/grml-live_autobuild_grml-small_wheezy.sh b/buildd/grml-live_autobuild_grml-small_wheezy.sh
index d2131ac..de88dbf 100755
--- a/buildd/grml-live_autobuild_grml-small_wheezy.sh
+++ b/buildd/grml-live_autobuild_grml-small_wheezy.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml-small_wheezy_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml-small_wheezy_$SHORTDATE
 SUITE=wheezy
 CLASSES='GRMLBASE,GRML_SMALL,RELEASE,I386,IGNORE'
 NAME=grml-small
diff --git a/buildd/grml-live_autobuild_grml64-medium_sid.sh b/buildd/grml-live_autobuild_grml64-medium_sid.sh
index c0e893a..f103275 100755
--- a/buildd/grml-live_autobuild_grml64-medium_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-medium_sid.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml64-medium_sid_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml64-medium_sid_$SHORTDATE
 SUITE=sid
 CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,AMD64,IGNORE'
 NAME=grml64-medium
diff --git a/buildd/grml-live_autobuild_grml64-medium_squeeze.sh b/buildd/grml-live_autobuild_grml64-medium_squeeze.sh
index 00795cc..54d4f9e 100755
--- a/buildd/grml-live_autobuild_grml64-medium_squeeze.sh
+++ b/buildd/grml-live_autobuild_grml64-medium_squeeze.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml64-medium_squeeze_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml64-medium_squeeze_$SHORTDATE
 SUITE=squeeze
 CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,AMD64,IGNORE'
 NAME=grml64-medium
diff --git a/buildd/grml-live_autobuild_grml64-medium_wheezy.sh b/buildd/grml-live_autobuild_grml64-medium_wheezy.sh
index 23dd80a..f609ec2 100755
--- a/buildd/grml-live_autobuild_grml64-medium_wheezy.sh
+++ b/buildd/grml-live_autobuild_grml64-medium_wheezy.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml64-medium_wheezy_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml64-medium_wheezy_$SHORTDATE
 SUITE=wheezy
 CLASSES='GRMLBASE,GRML_MEDIUM,RELEASE,AMD64,IGNORE'
 NAME=grml64-medium
diff --git a/buildd/grml-live_autobuild_grml64-small_sid.sh b/buildd/grml-live_autobuild_grml64-small_sid.sh
index ad7bdab..8732446 100755
--- a/buildd/grml-live_autobuild_grml64-small_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-small_sid.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml64-small_sid_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml64-small_sid_$SHORTDATE
 SUITE=sid
 CLASSES='GRMLBASE,GRML_SMALL,RELEASE,AMD64,IGNORE'
 NAME=grml64-small
diff --git a/buildd/grml-live_autobuild_grml64-small_squeeze.sh b/buildd/grml-live_autobuild_grml64-small_squeeze.sh
index ac8e594..948d9da 100755
--- a/buildd/grml-live_autobuild_grml64-small_squeeze.sh
+++ b/buildd/grml-live_autobuild_grml64-small_squeeze.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml64-small_squeeze_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml64-small_squeeze_$SHORTDATE
 SUITE=squeeze
 CLASSES='GRMLBASE,GRML_SMALL,RELEASE,AMD64,IGNORE'
 NAME=grml64-small
diff --git a/buildd/grml-live_autobuild_grml64-small_wheezy.sh b/buildd/grml-live_autobuild_grml64-small_wheezy.sh
index f4ba354..9f5f11d 100755
--- a/buildd/grml-live_autobuild_grml64-small_wheezy.sh
+++ b/buildd/grml-live_autobuild_grml64-small_wheezy.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml64-small_wheezy_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml64-small_wheezy_$SHORTDATE
 SUITE=wheezy
 CLASSES='GRMLBASE,GRML_SMALL,RELEASE,AMD64,IGNORE'
 NAME=grml64-small
diff --git a/buildd/grml-live_autobuild_grml64_sid.sh b/buildd/grml-live_autobuild_grml64_sid.sh
index 88bd0c6..49c0144 100755
--- a/buildd/grml-live_autobuild_grml64_sid.sh
+++ b/buildd/grml-live_autobuild_grml64_sid.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml64_sid_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml64_sid_$SHORTDATE
 SUITE=sid
 CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,AMD64,IGNORE'
 NAME=grml64
diff --git a/buildd/grml-live_autobuild_grml64_squeeze.sh b/buildd/grml-live_autobuild_grml64_squeeze.sh
index ed8254f..8940019 100755
--- a/buildd/grml-live_autobuild_grml64_squeeze.sh
+++ b/buildd/grml-live_autobuild_grml64_squeeze.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml64_squeeze_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml64_squeeze_$SHORTDATE
 SUITE=squeeze
 CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,AMD64,IGNORE'
 NAME=grml64
diff --git a/buildd/grml-live_autobuild_grml64_wheezy.sh b/buildd/grml-live_autobuild_grml64_wheezy.sh
index f6d64dd..cbfcc54 100755
--- a/buildd/grml-live_autobuild_grml64_wheezy.sh
+++ b/buildd/grml-live_autobuild_grml64_wheezy.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml64_wheezy_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml64_wheezy_$SHORTDATE
 SUITE=wheezy
 CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,AMD64,IGNORE'
 NAME=grml64
diff --git a/buildd/grml-live_autobuild_grml_sid.sh b/buildd/grml-live_autobuild_grml_sid.sh
index a149fd5..e47ea61 100755
--- a/buildd/grml-live_autobuild_grml_sid.sh
+++ b/buildd/grml-live_autobuild_grml_sid.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml_sid_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml_sid_$SHORTDATE
 SUITE=sid
 CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,I386,IGNORE'
 NAME=grml
diff --git a/buildd/grml-live_autobuild_grml_squeeze.sh b/buildd/grml-live_autobuild_grml_squeeze.sh
index b64cee2..397f3e8 100755
--- a/buildd/grml-live_autobuild_grml_squeeze.sh
+++ b/buildd/grml-live_autobuild_grml_squeeze.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml_squeeze_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml_squeeze_$SHORTDATE
 SUITE=squeeze
 CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,I386,IGNORE'
 NAME=grml
diff --git a/buildd/grml-live_autobuild_grml_wheezy.sh b/buildd/grml-live_autobuild_grml_wheezy.sh
index cf5a4e5..34d69e9 100755
--- a/buildd/grml-live_autobuild_grml_wheezy.sh
+++ b/buildd/grml-live_autobuild_grml_wheezy.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # settings for grml_live_run:
-DATE=$(date +%Y%m%d)
-ISO_NAME=grml_wheezy_$DATE.iso
+SHORTDATE=$(date +%Y%m%d)
+PRODUCT_NAME=grml_wheezy_$SHORTDATE
 SUITE=wheezy
 CLASSES='GRMLBASE,GRML_FULL,LATEX_CLEANUP,RELEASE,I386,IGNORE'
 NAME=grml