projects
/
grml2usb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ae3d73f
)
Templates in overlay directory: Trimm "[]" from version string, retrieve RELEASE_INFO...
mika/grml2iso-templates
author
Michael Prokop
<mika@grml.org>
Fri, 27 Jan 2012 10:43:06 +0000
(11:43 +0100)
committer
Michael Prokop
<mika@grml.org>
Fri, 27 Jan 2012 10:44:53 +0000
(11:44 +0100)
grml2iso
patch
|
blob
|
history
diff --git
a/grml2iso
b/grml2iso
index
b27cb34
..
b196c17
100755
(executable)
--- 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")
# 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 ',./;\- ')"
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)
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
value="$(eval echo '$'"$param")"
# copy parameterized files from the overlay directory