From 59cd5e8f87709bc6dbfe3775ce324cb08cbd79f3 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 27 Jan 2012 11:43:06 +0100 Subject: [PATCH] Templates in overlay directory: Trimm "[]" from version string, retrieve RELEASE_INFO and adjust GRML_NAME, DATE + RELEASE_INFO --- grml2iso | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grml2iso b/grml2iso index b27cb34..b196c17 100755 --- a/grml2iso +++ b/grml2iso @@ -212,13 +212,14 @@ Options: # 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") + VERSION=$(awk '{print $2}' "$GRML_VERSION_FILE" | tr -d '[]') RELEASENAME=$(sed 's/.*- \(.*\).*\[.*/\1/' "$GRML_VERSION_FILE") DATE=$(sed 's/.*\[\(.*\)].*/\1/' "$GRML_VERSION_FILE") SHORT_NAME="$(echo $GRML_NAME | tr -d ',./;\- ')" + RELEASE_INFO="$(echo $GRML_NAME | tr -d ',./;\- ')" BOOTID=$(cat conf/bootid.txt) - for param in SHORT_NAME VERSION BOOTID ; do + for param in GRML_NAME SHORT_NAME VERSION BOOTID DATE RELEASE_INFO ; do value="$(eval echo '$'"$param")" # copy parameterized files from the overlay directory -- 2.1.4