EG install scripts: drop -l argument from su to preserve environment (for ssh agent...

diff --git a/deployment/install-eg.sh b/deployment/install-eg.sh
index 152df94..0f651cc 100755 (executable)
--- a/deployment/install-eg.sh
+++ b/deployment/install-eg.sh
@@ -17,7 +17,7 @@ SITKACONF_BRANCH="eg28"
 SITKATOOLS="/root/sitka-tools"
 
 suwrap() {
-  su -s /bin/bash -l -c "source ~/.bashrc ; $1" $2
+  su -s /bin/bash -c "source ~/.bashrc ; $1" $2
 }
 
 # as DEFAULT_USER

diff --git a/deployment/install-osrf.sh b/deployment/install-osrf.sh
index 3c1feb9..66d1fe8 100755 (executable)
--- a/deployment/install-osrf.sh
+++ b/deployment/install-osrf.sh
@@ -23,13 +23,13 @@ apt-get install git-core build-essential translate-toolkit python-polib bsdmainu
 if [ ! -d "${SITKACONF}" ]
 then
   # this will fail unless DEFAULT_USER has read access to the repo
-  su -l -c "cd ${HOMEDIR} && git clone git+ssh://git@git.sitka.bclibraries.ca/sitka-infra/sysadmin" ${DEFAULT_USER}
+  su -c "cd ${HOMEDIR} && git clone git+ssh://git@git.sitka.bclibraries.ca/sitka-infra/sysadmin" ${DEFAULT_USER}
 fi
-su -l -c "cd ${HOMEDIR}/sysadmin && git fetch origin && git checkout ${SITKACONF_BRANCH} && git pull" ${DEFAULT_USER}
+su -c "cd ${HOMEDIR}/sysadmin && git fetch origin && git checkout ${SITKACONF_BRANCH} && git pull" ${DEFAULT_USER}
 if [ ! -d "${BUILDDIR}/.git" ] ; then
-  su -l -c "cd ${HOMEDIR} && git clone git://git.evergreen-ils.org/OpenSRF.git opensrf" ${DEFAULT_USER}
+  su -c "cd ${HOMEDIR} && git clone git://git.evergreen-ils.org/OpenSRF.git opensrf" ${DEFAULT_USER}
 fi
-su -l -c "cd ${BUILDDIR} && git fetch origin && git checkout ${BRANCH} && git pull" ${DEFAULT_USER}
+su -c "cd ${BUILDDIR} && git fetch origin && git checkout ${BRANCH} && git pull" ${DEFAULT_USER}
  
 # as root
 echo "need a placeholder apache2.conf, installing from config repo..."
@@ -45,9 +45,9 @@ cd ${BUILDDIR} && make -f src/extras/Makefile.install ubuntu-trusty
  
 # as DEFAULT_USER
 echo "Configuring and building OpenSRF..."
-su -l -c "cd ${BUILDDIR} && autoreconf -i" ${DEFAULT_USER}
-su -l -c "cd ${BUILDDIR} && ./configure --prefix=${INSTALLDIR} --sysconfdir=${INSTALLDIR}/conf" ${DEFAULT_USER}
-su -l -c "cd ${BUILDDIR} && make" ${DEFAULT_USER}
+su -c "cd ${BUILDDIR} && autoreconf -i" ${DEFAULT_USER}
+su -c "cd ${BUILDDIR} && ./configure --prefix=${INSTALLDIR} --sysconfdir=${INSTALLDIR}/conf" ${DEFAULT_USER}
+su -c "cd ${BUILDDIR} && make" ${DEFAULT_USER}
  
 # as root
 echo "Installing OpenSRF..."