wheezy installer; updates to match eg master

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/installer/wheezy/eg_wheezy_installer.sh b/installer/wheezy/eg_wheezy_installer.sh
index d0fba7f..37c75a9 100755 (executable)
--- a/installer/wheezy/eg_wheezy_installer.sh
+++ b/installer/wheezy/eg_wheezy_installer.sh
@@ -75,20 +75,9 @@ fi;
 # XXX for now, fetch the debian-wheezy install target working branches and merge in master
 # XXX The git-config pieces are only necessary for merging the working branches
 OSRF_COMMAND='
-git config --global user.email "opensrf@example.com"
-git config --global user.name "OpenSRF"
 cd /home/opensrf;
 git clone git://git.evergreen-ils.org/OpenSRF.git;
-cd OpenSRF;
-git remote add working git://git.evergreen-ils.org/working/OpenSRF.git;
-git fetch working
-git merge -m "merging wheezy install target" working/collab/berick/debian-wheezy-install-target
-cd /home/opensrf;
 git clone git://git.evergreen-ils.org/Evergreen.git;
-cd Evergreen;
-git remote add working git://git.evergreen-ils.org/working/Evergreen.git;
-git fetch working
-git merge -m "merging wheezy install target" working/collab/berick/debian-wheezy-install-target
 '
 su - opensrf sh -c "$OSRF_COMMAND";
 
@@ -132,8 +121,11 @@ su - opensrf sh -c "$OSRF_COMMAND"
 cd /home/opensrf/OpenSRF;
 make install
 
+export PATH=/openils/bin:$PATH
+
 # Build and install the ILS
 OSRF_COMMAND='
+export PATH=/openils/bin:$PATH
 cd /home/opensrf/Evergreen;
 autoreconf -i;
 ./configure --prefix=/openils --sysconfdir=/openils/conf;
@@ -164,7 +156,7 @@ su - postgres sh -c 'createuser -P -s evergreen;'
 
 # Apply the DB schema
 cd /home/opensrf/Evergreen
-perl Open-ILS/src/support-scripts/eg_db_config.pl \
+perl Open-ILS/src/support-scripts/eg_db_config \
     --create-database       \
     --create-schema         \
     --create-offline        \
@@ -180,7 +172,7 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl \
 # Copy apache configs into place and create SSL cert
 cp Open-ILS/examples/apache/eg.conf       /etc/apache2/sites-available/
 cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
-cp Open-ILS/examples/apache/startup.pl    /etc/apache2/
+cp Open-ILS/examples/apache/eg_startup    /etc/apache2/
 
 mkdir -p /etc/apache2/ssl;
 if [ ! -f /etc/apache2/ssl/server.key ] ; then