Remove unwanted file

Fix gitignore list
Fix export format of config

diff --git a/.gitignore b/.gitignore
index cad684a16ce02489227d9f1f9797e59eb6020df2..405e312f98bc689c9ed541aca3b4b650aca035e4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 root
 root.conf
 root
 root.conf

+lib/config.sh

 ihttpd-*.rpm
 ihttpd-*.rpm

diff --git a/cook b/cook
index e501fe26ddeee9f0d2ff406f109cc700d89f1a40..c3d1a4fba25f078704d1fd89e6d0e2af48ee4931 100755 (executable)
--- a/cook
+++ b/cook
@@ -5,7 +5,7 @@ export LC_ALL=C
 
 # Extract configuration
 echo '#! /bin/sh -e' > lib/config.sh
 
 # 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
 
 # Source config
 . lib/config.sh

diff --git a/lib/export.sh b/lib/export.sh
index e8c65fcb5a18f76a6a57d0149387545a66ce6c6a..40e37045e55e50fdeba81957d68cc0b8c7e4710e 100644 (file)
--- 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
 
 # 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
 done