Using separate rc file for installer

6 files changed, 13 insertions, 13 deletions

diff --git a/base-install.sh b/base-install.sh
index 93f241a..22edce9 100755
--- a/base-install.sh
+++ b/base-install.sh
@@ -24,7 +24,7 @@ if [ ! -e "$APTITUDE" ]; then
   exit 1
 fi
 
-touch $HOME/.bashrc
+touch $OT_UI_CONF
 
 # Pkgs
 packs="lsb-release binutils gcc g++ gfortran wget hostname pwgen git-core raptor-utils r-base sun-java6-jdk libssl-dev zlib1g-dev libreadline-dev libmysqlclient-dev libcurl4-openssl-dev libxml2-dev libxslt1-dev libgsl0-dev sun-java6-jdk libreadline5-dev"
@@ -86,8 +86,8 @@ if [ ! -f $JAVA_CONF ]; then
   echo "if echo \"\$PATH\" | grep -v \"$JAVA_HOME\"; then export PATH=\"$JAVA_HOME:\$PATH\"; fi" >> "$JAVA_CONF"
 
   echo "Java configuration has been stored in '$JAVA_CONF'."
-  if ! grep "$JAVA_CONF" $HOME/.bashrc >/dev/null 2>&1; then
-    echo ". \"$JAVA_CONF\"" >> $HOME/.bashrc
+  if ! grep "$JAVA_CONF" $OT_UI_CONF >/dev/null 2>&1; then
+    echo ". \"$JAVA_CONF\"" >> $OT_UI_CONF
   fi
 fi
 
diff --git a/kernlab.sh b/kernlab.sh
index 4267a86..a49635f 100755
--- a/kernlab.sh
+++ b/kernlab.sh
@@ -60,8 +60,8 @@ if [ ! -f $KL_CONF ]; then
   echo "if echo \"\$R_LIBS\" | grep -v \"$KL_DEST\">/dev/null 2>&1; then export R_LIBS=\"$KL_DEST\"; fi" >> "$KL_CONF"
   echo "R package destination has been stored in '$KL_CONF'."
 
-  if ! grep "$KL_CONF" $HOME/.bashrc >/dev/null 2>&1 ; then
-    echo ". \"$KL_CONF\"" >> $HOME/.bashrc
+  if ! grep "$KL_CONF" $OT_UI_CONF >/dev/null 2>&1 ; then
+    echo ". \"$KL_CONF\"" >> $OT_UI_CONF
   fi
 
 fi
diff --git a/openbabel.sh b/openbabel.sh
index cbc0f01..31c3596 100755
--- a/openbabel.sh
+++ b/openbabel.sh
@@ -60,15 +60,15 @@ if [ ! -f "$OB_CONF" ]; then
   echo "if [ -z \"\$RUBYLIB\" ]; then export RUBYLIB=\"$OB_DEST_BINDINGS\"; fi" >> "$RUBY_CONF"
 
   echo "Openbabel configuration has been stored in '$OB_CONF'."
-  if ! grep "$OB_CONF" $HOME/.bashrc >/dev/null 2>&1 ; then
-    echo ". \"$OB_CONF\"" >> $HOME/.bashrc
+  if ! grep "$OB_CONF" $OT_UI_CONF >/dev/null 2>&1 ; then
+    echo ". \"$OB_CONF\"" >> $OT_UI_CONF
   fi
 
 fi
 
 echo "Bindings:"
 OB_DONE=false
-. "$HOME/.bashrc"
+. "$OT_UI_CONF"
 mkdir "$OB_DEST_BINDINGS">/dev/null 2>&1
 if [ ! -d "$OB_DEST_BINDINGS" ]; then
   echo "Install directory '$OB_DEST_BINDINGS' is not available! Aborting..."
diff --git a/redis.sh b/redis.sh
index 503cfca..330bfa4 100755
--- a/redis.sh
+++ b/redis.sh
@@ -63,8 +63,8 @@ if [ ! -f $REDIS_CONF ]; then
   echo "export PATH=$REDIS_DEST/src:\$PATH" >> "$REDIS_CONF"
   echo "Redis configuration has been stored in '$REDIS_CONF'."
 
-  if ! grep ". \"$REDIS_CONF\"" $HOME/.bashrc; then
-    echo ". \"$REDIS_CONF\"" >> $HOME/.bashrc
+  if ! grep ". \"$REDIS_CONF\"" $OT_UI_CONF; then
+    echo ". \"$REDIS_CONF\"" >> $OT_UI_CONF
   fi
 
 fi
diff --git a/ruby.sh b/ruby.sh
index bb7ee90..0a773bd 100755
--- a/ruby.sh
+++ b/ruby.sh
@@ -53,8 +53,8 @@ if ! [ -f "$RUBY_CONF" ]; then
   echo "if echo \"\$PATH\" | grep -v \"$RUBY_DEST\">/dev/null 2>&1; then export PATH=\"$RUBY_DEST/bin:\$PATH\"; fi" >> "$RUBY_CONF"
 
   echo "Ruby configuration has been stored in '$RUBY_CONF'."
-  if ! grep "$RUBY_CONF" $HOME/.bashrc >/dev/null 2>&1 ; then
-    echo ". \"$RUBY_CONF\"" >> $HOME/.bashrc
+  if ! grep "$RUBY_CONF" $OT_UI_CONF >/dev/null 2>&1 ; then
+    echo ". \"$RUBY_CONF\"" >> $OT_UI_CONF
   fi
 fi
 . "$RUBY_CONF"
diff --git a/utils.sh b/utils.sh
index 8c3d633..cff99da 100755
--- a/utils.sh
+++ b/utils.sh
@@ -32,6 +32,6 @@ abs_path()
   esac
 }
 
-. "$HOME/.bashrc"
+. "$OT_UI_CONF"
 . "`pwd`/config.sh"
 check_dest