From: Jason Etheridge <jason@esilibrary.com>
Date: Mon, 7 Oct 2013 20:28:52 +0000 (-0400)
Subject: copy/paste errors; cleaning this up
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=13882bb90df366745831994c4cd431fd3d757f26;p=working%2Frandom.git

copy/paste errors; cleaning this up
---

diff --git a/installer/wheezy/eg_wheezy_installer.sh b/installer/wheezy/eg_wheezy_installer.sh
index 34c9d5705..b87fd5886 100755
--- a/installer/wheezy/eg_wheezy_installer.sh
+++ b/installer/wheezy/eg_wheezy_installer.sh
@@ -141,33 +141,30 @@ echo 'Tip of Evergreen:' `git log --format=oneline | head -1`
 # Install pre-reqs
 mkdir -p /usr/src/evergreen; 
 cd /usr/src/evergreen;
-if [ $YES ]; then
 echo _.-~= Installing OpenSRF pre-requisites
+if [ $YES ]; then
     yes | make -f /home/opensrf/OpenSRF/src/extras/Makefile.install debian-wheezy
-echo Return Value = $?
-echo End of Installing OpenSRF pre-requisites =~-._
-echo _.-~= Installing Evergreen pre-requisites
-    yes | make -f /home/opensrf/OpenSRF/src/extras/Makefile.install debian-wheezy
-echo Return Value = $?
-echo End of Installing Evergreen pre-requisites =~-._
-echo _.-~= Installing Evergreen database pre-requisites
-    yes | make -f /home/opensrf/Evergreen/Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
-echo Return Value = $?
-echo End of Installing Evergreen database pre-requisites =~-._
 else
-echo _.-~= Installing OpenSRF pre-requisites
     make -f /home/opensrf/OpenSRF/src/extras/Makefile.install debian-wheezy
+fi;
 echo Return Value = $?
 echo End of Installing OpenSRF pre-requisites =~-._
 echo _.-~= Installing Evergreen pre-requisites
-    make -f /home/opensrf/OpenSRF/src/extras/Makefile.install debian-wheezy
+if [ $YES ]; then
+    yes | make -f /home/opensrf/Evergreen/Open-ILS/src/extras/Makefile.install debian-wheezy
+else
+    make -f /home/opensrf/Evergreen/Open-ILS/src/extras/Makefile.install debian-wheezy
+fi;
 echo Return Value = $?
 echo End of Installing Evergreen pre-requisites =~-._
 echo _.-~= Installing Evergreen database pre-requisites
+if [ $YES ]; then
+    yes | make -f /home/opensrf/Evergreen/Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+else
     make -f /home/opensrf/Evergreen/Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+fi;
 echo Return Value = $?
 echo End of Installing Evergreen database pre-requisites =~-._
-fi;
 
 # Configure rsyslog and restart
 cp /home/opensrf/Evergreen/Open-ILS/examples/evergreen-rsyslog.conf /etc/rsyslog.d/evergreen.conf