Changeset 19018 for gsdl

Timestamp:

2009-04-16T17:41:41+12:00 (15 years ago)

Author:

ak19

Message:

Fixed error in previous commit: the inclusion of quotes meant the pattern match failed.

File:

• gsdl/trunk/runtime-src/packages/apache-httpd/install-bindist.sh (modified) (6 diffs)

gsdl/trunk/runtime-src/packages/apache-httpd/install-bindist.sh

@@ -104 +104 @@
 cd "$currentdir/conf/extra/"
 for one_file in httpd-dav.conf httpd-manual.conf httpd-autoindex.conf httpd-vhosts.conf httpd-ssl.conf httpd-multilang-errordoc.conf; do
-    sed -e "s;\"$PRE\";\"$SR\";" "$one_file" > "$one_file.tmp"
+    sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp"
     mv $one_file.tmp $one_file
     chmod u+w $one_file
@@ -111 +111 @@
 cd "$currentdir/conf/original/extra/"
 for one_file in httpd-dav.conf httpd-manual.conf httpd-autoindex.conf httpd-vhosts.conf httpd-ssl.conf httpd-multilang-errordoc.conf; do
-    sed -e "s;\"$PRE\";\"$SR\";" "$one_file" > "$one_file.tmp"
+    sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp"
     mv $one_file.tmp $one_file
     chmod u+w $one_file
@@ -118 +118 @@
 cd "$currentdir/lib/"
 for one_file in "apr-util-1/apr_dbd_odbc.la" "apr-util-1/apr_dbd_sqlite3.la" "pkgconfig/apr-util-1.pc" "pkgconfig/apr-1.pc" libaprutil-1.la libapr-1.la; do
-    sed -e "s;\"$PRE\";\"$SR\";" "$one_file" > "$one_file.tmp"
+    sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp"
     mv $one_file.tmp $one_file
     chmod u+w $one_file
@@ -125 +125 @@
 cd "$currentdir/build/"
 for one_file in config_vars.mk config.nice apr_rules.mk; do
-    sed -e "s;\"$PRE\";\"$SR\";" "$one_file" > "$one_file.tmp"
+    sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp"
     mv $one_file.tmp $one_file
     chmod u+w $one_file
@@ -132 +132 @@
 cd "$currentdir/bin/"
 for one_file in apu-1-config apr-1-config; do
-    sed -e "s;\"$PRE\";\"$SR\";" "$one_file" > "$one_file.tmp"
+    sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp"
     mv $one_file.tmp $one_file
     chmod u+w $one_file
@@ -139 +139 @@
 cd "$currentdir/include/"
 for one_file in ap_config_auto.h ap_config_layout.h; do
-    sed -e "s;\"$PRE\";\"$SR\";" "$one_file" > "$one_file.tmp"
+    sed -e "s;$PRE;$SR;" "$one_file" > "$one_file.tmp"
     mv $one_file.tmp $one_file
     chmod u+w $one_file
 done
 
-sed -e "s;\"$PRE\";\"$SR\";" "$currentdir/conf/original/httpd.conf" > "$currentdir/conf/original/httpd.conf.tmp"
+sed -e "s;$PRE;$SR;" "$currentdir/conf/original/httpd.conf" > "$currentdir/conf/original/httpd.conf.tmp"
     mv "$currentdir/conf/original/httpd.conf.tmp" "$currentdir/conf/original/httpd.conf"
     chmod u+w "$currentdir/conf/original/httpd.conf"