From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 4 Dec 2014 21:35:29 +0000 (-0500)
Subject: trusty installer allow branch/repo pass in
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5198df5b4523a1a46b17a4a1b19cdc0551faabd1;p=working%2Frandom.git

trusty installer allow branch/repo pass in

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/installer/trusty/eg_trusty_installer.sh b/installer/trusty/eg_trusty_installer.sh
index a2b963aca..a1ca22f51 100755
--- a/installer/trusty/eg_trusty_installer.sh
+++ b/installer/trusty/eg_trusty_installer.sh
@@ -87,14 +87,17 @@ function init_variables {
     # You can override these like so:
     #       EVERGREEN_BRANCH='master' ./eg_trusty_installer.sh
     # -----------------------------------------------------------------------
-    OPENSRF_REPO='git://git.evergreen-ils.org/OpenSRF.git'
-    OPENSRF_BRANCH='master'
-    EVERGREEN_REPO='git://git.evergreen-ils.org/Evergreen.git'
-    EVERGREEN_BRANCH='master'
+    [ -z "$OPENSRF_REPO" ] && \
+        OPENSRF_REPO='git://git.evergreen-ils.org/OpenSRF.git'
+    [ -z "$OPENSRF_BRANCH" ] && OPENSRF_BRANCH='master'
+    [ -z "$EVERGREEN_REPO" ] && \
+        EVERGREEN_REPO='git://git.evergreen-ils.org/Evergreen.git'
+    [ -z "$EVERGREEN_BRANCH" ] && EVERGREEN_BRANCH='master'
     echo OPENSRF_REPO=${OPENSRF_REPO}
     echo OPENSRF_BRANCH=${OPENSRF_BRANCH}
     echo EVERGREEN_REPO=${EVERGREEN_REPO}
     echo EVERGREEN_BRANCH=${EVERGREEN_BRANCH}
+
     OPENSRF_PREREQ_TARGET=ubuntu-trusty
     EVERGREEN_PREREQ_TARGET=ubuntu-trusty
     EVERGREEN_DB_PREREQ_TARGET=postgres-server-ubuntu-trusty