grml2iso: support -t to set temporary working directory

[grml2usb.git] / grml2iso

diff --git a/grml2iso b/grml2iso
index d9236ee..7e92666 100755 (executable)
--- a/grml2iso
+++ b/grml2iso
@@ -19,6 +19,7 @@
 # path to the grml2usb script you'd like to use
   [ -n "$GRML2USB" ] || GRML2USB='grml2usb'
 # work directory for creating the filesystem
+  [ -n "$TMPDIR" ]   && WRKDIR="${TMPDIR}/grml2iso.tmp"
   [ -n "$WRKDIR" ]   || WRKDIR='/tmp/grml2iso.tmp'
 # support mkisofs as well as genisoimage
 if which xorriso >/dev/null 2>&1 ; then
@@ -44,7 +45,7 @@ Options:
      -c Directory        Copy files from directory to generated ISO
      -f                  Force overwrite of existing target.iso
      -r BootParam        Remove specified boot params.
-                         Could be specfied multiple times.
+                         Can be specified multiple times.
      -p <grml2usb param> Add the specified parameter to the grml2usb
                          commandline. For a list of valid parameters have
                          a look at the grml2usb manpage.
@@ -53,6 +54,8 @@ Options:
                          file from the specified URI. Please note that due to
                          restrictions in the bootprocess only IPs are allowed.
                          Supported protocols are: http and ftp
+     -t Directory        Directory that should be used for temporary files
+                         during build. Defaults to /tmp/grml2iso.tmp if unset.
 
      Examples:
      $0 -s http://192.168.23.42:8000/grml/ -o small.iso grml64_2010.12.iso
@@ -74,7 +77,7 @@ Options:
   FORCE=''
   URI=''
   typeset -a GRML2USB_OPTS
-  while getopts fb:c:o:r:p:s: name; do
+  while getopts fb:c:o:r:p:s:t: name; do
     case $name in
       o)   ISOFILE="$OPTARG";;
       b)   GRML2USB_OPTS+=(--bootoptions="$OPTARG");;
@@ -83,6 +86,7 @@ Options:
       r)   GRML2USB_OPTS+=(--remove-bootoption="$OPTARG");;
       p)   GRML2USB_OPTS+=("$OPTARG");;
       s)   URI="$OPTARG";;
+      t)   WRKDIR="$OPTARG";;
       ?)   usage 2;;
     esac
   done
@@ -91,6 +95,10 @@ Options:
     GRML2USB_OPTS+=(--bootoptions="fetch=$URI")
   fi
 
+  if [ -n "$WRKDIR" ] ; then
+    GRML2USB_OPTS+=(--tmpdir="$WRKDIR")
+  fi
+
 # make sure -o is specified
   [ -n "$ISOFILE" ] || usage 1
 
@@ -203,9 +211,42 @@ Options:
 # copy specified directory to cd {{{
   if [ -n "$DIR" ] ; then
      echo >&2 "Copying ${DIR} to generated ISO"
-     rsync -a ${DIR}/ .
+     for param in GRML_NAME VERSION RELEASENAME DATE SHORT_NAME \
+         VERSION BOOTID RELEASE_INFO ; do
+       EXCLUDE_PARAM="$EXCLUDE_PARAM --exclude **%${param}%**"
+     done
+     rsync -a ${DIR}/ $EXCLUDE_PARAM .
   fi
 
+  # adjust files from overlay directory
+  for GRML_VERSION_FILE in $(find . -name grml-version) ; do
+    GRML_NAME=$(awk '{print $1}' "$GRML_VERSION_FILE")
+    VERSION=$(awk '{print $2}' "$GRML_VERSION_FILE")
+    RELEASENAME=$(sed 's/.*- \(.*\).*\[.*/\1/' "$GRML_VERSION_FILE")
+    DATE=$(sed 's/.*\[\(.*\)].*/\1/' "$GRML_VERSION_FILE")
+    SHORT_NAME="$(echo $GRML_NAME | tr -d ',./;\- ')"
+    RELEASE_INFO="$GRML_NAME $VERSION - $RELEASENAME"
+    BOOTID=$(cat conf/bootid.txt)
+
+    for param in GRML_NAME VERSION RELEASENAME DATE SHORT_NAME \
+        RELEASE_INFO BOOTID  ; do
+      value="$(eval echo '$'"$param")"
+
+      # copy parameterized files from the overlay directory
+      for file in $(find ${DIR} -name "*%$param%*") ; do
+        file=${file##$DIR/}
+        target_dir="$(dirname ${file})"
+        mkdir -p "$target_dir" || true
+        cp -r ${DIR}/${file} ./${target_dir}/"$(basename ${file/\%${param}\%/$value})"
+      done
+
+      # adjust config files
+      for file in ./boot/isolinux/*.cfg ./boot/isolinux/*.msg \
+        ./boot/grub/*.cfg ; do
+        sed -i "s/%$param%/$value/g" ${file} 2>/dev/null || true
+      done
+    done
+  done
 # }}}
 
 # generate the CD/DVD ISO {{{
@@ -215,8 +256,8 @@ Options:
 
 # pad the output ISO to multiples of 256 KiB for partition table support {{{
   siz=$($getfilesize "$ISOFILE")
-  cyls=$(echo "$siz / 512 / 32 / 16 + 1" | bc)  # C=$cyls H=16 S=32
-  ofs=$(echo "$cyls * 16 * 32 * 512 - 1" | bc)  # padding offset (size - 1)
+  cyls=$(($siz / 512 / 32 / 16 + 1))  # C=$cyls H=16 S=32
+  ofs=$(($cyls * 16 * 32 * 512 - 1))  # padding offset (size - 1)
   dd if=/dev/zero bs=1 count=1 seek=$ofs of="$ISOFILE" 2>/dev/null
 # }}}