SF.net SVN: ledger-smb:[5398] branches/1.3

[..hidden..]

Revision: 5398
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5398&view=rev
Author:   hasorli
Date:     2012-12-23 03:57:01 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
fix sed line, fix read input, fix change of source name from ledgersmb-httpd.conf to ledgersmb-httpd.conf.template

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/configure_apache.sh

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-12-22 23:12:18 UTC (rev 5397)
+++ branches/1.3/Changelog	2012-12-23 03:57:01 UTC (rev 5398)
@@ -3,13 +3,17 @@
 Supported Presently
 
 Changelog for 1.3.27
-
 * Detect whether ledgersmb.conf exists during Makefile.PL run and create if
   not (Chris T)
 * Fixed prepare-company-database.sh clobbering the Apache configuration on
   every run (Chris T, 3595000)
 * Fixed error sorting recon search by account (Chris T, h/t Erik H, 3589473)
+* Fixed configure_apache.sh, read input, change of file name from 
+  ledgersmb-httpd.conf to ledgersmb-httpd.conf.template (Havard S)
 
+Chris T is Chris Travers
+Havard S is Havard Sorli
+
 Changelog for 1.3.26
 * Added db statistics post-upgrade and pre/post rebuild (Chris T, 3586113)
 * Merged in fcgi support from addons (Chris T)

Modified: branches/1.3/configure_apache.sh
===================================================================
--- branches/1.3/configure_apache.sh	2012-12-22 23:12:18 UTC (rev 5397)
+++ branches/1.3/configure_apache.sh	2012-12-23 03:57:01 UTC (rev 5398)
@@ -2,15 +2,15 @@
 
 CWD=`pwd`
 
-sed -i.orig "s|WORKING_DIR|$CWD|" ledgersmb-httpd.conf;
+sed -e "s|WORKING_DIR|$CWD|" ledgersmb-httpd.conf.template > ledgersmb-httpd.conf
 
 username="apache"
-read -p "Which user does your web server run as? [$username]"
+read -p "Which user does your web server run as? [$username]" REPLY
 
 chown ${REPLY:-$username} spool templates css
 
 location="/etc/httpd/conf.d"
-read -p "Where do we copy the ledgersmb-httpd.conf file to? [$location] "
+read -p "Where do we copy the ledgersmb-httpd.conf file to? [$location] " REPLY
 
 cp ledgersmb-httpd.conf ${REPLY:-$location}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.