[cap4-devel] [SCM] cap4 branch master updated. b91876d58ddbface949852383ec43be0891d0ef9

[Christopher D. M. <cas...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".

The branch, master has been updated
       via  b91876d58ddbface949852383ec43be0891d0ef9 (commit)
      from  15babbd57a532cdb3cfb058d092497501dccd9ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b91876d58ddbface949852383ec43be0891d0ef9
Author: CDM <cas...@us...>
Date:   Wed Feb 29 10:05:47 2012 -0700

    CDM: setup profile if non system correctly with sed command call

-----------------------------------------------------------------------

Summary of changes:
 etc/profile.d/cap.csh |    2 +-
 etc/profile.d/cap.sh  |    2 +-
 install.sh            |    6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/etc/profile.d/cap.csh b/etc/profile.d/cap.csh
index db49656..a2ba686 100644
--- a/etc/profile.d/cap.csh
+++ b/etc/profile.d/cap.csh
@@ -27,7 +27,7 @@
 ############################################################################ 
 
 # if cap is installed in system level directories, it should be in our path already,
-CAPHOME=SYSTEM
+CAPHOME=INSERT_CAPHOME_HERE
 if ( $CAPHOME != "SYSTEM" ) then
 	setenv PATH $CAPHOME/bin:$PATH
 	setenv MANPATH $CAPHOME/man:$MANPATH
diff --git a/etc/profile.d/cap.sh b/etc/profile.d/cap.sh
index d9d9c68..20ac733 100644
--- a/etc/profile.d/cap.sh
+++ b/etc/profile.d/cap.sh
@@ -27,7 +27,7 @@
 ############################################################################ 
 
 # if cap is installed in system level directories, it should be in our path already,
-CAPHOME=SYSTEM
+CAPHOME=INSERT_CAPHOME_HERE
 if [ $CAPHOME != "SYSTEM" ]; then
 	export PATH=$CAPHOME/bin:$PATH
 	export MANPATH=$CAPHOME/man:$MANPATH
diff --git a/install.sh b/install.sh
index a2f26c5..fc00905 100755
--- a/install.sh
+++ b/install.sh
@@ -72,10 +72,12 @@ ln -sf ${_cap_home}/bin/deploy ${BUILD_ROOT}/usr/bin/deploy
 #
 mkdir -p ${BUILD_ROOT}/etc/profile.d
 if [ ${_cap_home} != "." ]; then
+	sed -i -e "s!INSERT_CAPHOME_HERE!SYSTEM!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.csh
+	sed -i -e "s!INSERT_CAPHOME_HERE!SYSTEM!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.sh
 	ln -sf ${_cap_home}/etc/profile.d/cap.sh ${BUILD_ROOT}/etc/profile.d/cap.sh
 	ln -sf ${_cap_home}/etc/profile.d/cap.csh ${BUILD_ROOT}/etc/profile.d/cap.csh
 else
-	sed -i -e "s!SYSTEM!${BUILD_ROOT}!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.csh
-	sed -i -e "s!SYSTEM!${BUILD_ROOT}!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.sh
+	sed -i -e "s!INSERT_CAPHOME_HERE!${BUILD_ROOT}!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.csh
+	sed -i -e "s!INSERT_CAPHOME_HERE!${BUILD_ROOT}!g" ${BUILD_ROOT}/${_cap_home}/etc/profile.d/cap.sh
 fi
 


hooks/post-receive
-- 
cap4