From: Raphaƫl Gertz Date: Tue, 21 Jun 2016 10:05:51 +0000 (+0200) Subject: Remove unwanted file X-Git-Tag: 0.1~14 X-Git-Url: https://git.rapsys.eu/distcook/commitdiff_plain/0fc89b9501a8a2161ed80710836b1c2089c47334?ds=sidebyside Remove unwanted file Fix gitignore list Fix export format of config --- diff --git a/.gitignore b/.gitignore index cad684a..405e312 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ root root.conf +lib/config.sh ihttpd-*.rpm diff --git a/cook b/cook index e501fe2..c3d1a4f 100755 --- a/cook +++ b/cook @@ -5,7 +5,7 @@ export LC_ALL=C # Extract configuration echo '#! /bin/sh -e' > lib/config.sh -cat config/*.conf | perl -pne 'undef $_ if /^#/; s/^/export /' >> lib/config.sh +cat config/*.conf | perl -pne 'if (/^#/) {undef $_;} else {s/^/export /;}' >> lib/config.sh # Source config . lib/config.sh diff --git a/lib/export.sh b/lib/export.sh index e8c65fc..40e3704 100644 --- a/lib/export.sh +++ b/lib/export.sh @@ -5,5 +5,5 @@ cat /dev/null > root.conf # Append every config parameters for i in `cat config/*.conf | perl -pne 'undef $_ if /^#/; s/=.*$//'`; do - eval echo ${i}=\$$i | tee -a root.conf + eval echo ${i}=\'\$$i\' | tee -a root.conf done