summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Fetka <[email protected]>2013-03-12 05:08:55 (GMT)
committer Mario Fetka <[email protected]>2013-03-12 05:08:55 (GMT)
commitdf790e40f723cd98da244fed11303281007082e7 (patch)
treeb16a8fc3870622870bfc64313180cbc2ab84bc4b
parenta37aec8bd0c2707f6fea1cf74eda862cdfafdaa2 (diff)
do the unix to dos convert later in the process to catch all generated files
-rw-r--r--lib/builder-targets.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/builder-targets.sh b/lib/builder-targets.sh
index c48b898..c01deca 100644
--- a/lib/builder-targets.sh
+++ b/lib/builder-targets.sh
@@ -190,7 +190,6 @@ builder_create() {
# Copy files and convert text files to dos format
cp -Rv ${PRODUCT_DIR}/OPSI $INST_DIR
cp -Rv ${PRODUCT_DIR}/CLIENT_DATA $INST_DIR
- find $INST_DIR/CLIENT_DATA -type f | xargs -n1 -iREP sh -c 'file -i $0 | grep -v "utf-16" | grep "text/plain" && '$CMD_unix2dos' $0 ' REP >/dev/null
# converting icon file
local iconfile_src=${DL_DIST_FILE[$ICON_DL_INDEX]}
@@ -226,7 +225,10 @@ builder_create() {
d
}" $inst_file
done
-
+
+ # convert to dos file linefeed
+ find $INST_DIR/CLIENT_DATA -type f | xargs -n1 -iREP sh -c 'file -i $0 | grep -v "utf-16" | grep "text/plain" && '$CMD_unix2dos' $0 ' REP >/dev/null
+
# replace variables from file OPSI/control
local release_new=${CREATOR_TAG}${RELEASE}
# sed -e "s!VERSION!$VERSION!g" -e "s!RELEASE!${release_new}!g" -e "s!PRIORITY!$PRIORITY!g" -e "s!ADVICE!$ADVICE!g" ${PRODUCT_DIR}/OPSI/control >$INST_DIR/OPSI/control

Powered by Domaintechnik.at | Hosting - Domain - Webspace