From ae9d6c6a06360007668e51a9be19a8b66374000d Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Fri, 23 Mar 2012 09:38:26 +0100 Subject: Simplified shell code --- base-install.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/base-install.sh b/base-install.sh index e9e0860..be8097d 100755 --- a/base-install.sh +++ b/base-install.sh @@ -87,13 +87,13 @@ if [ ! -f $JAVA_CONF ]; then exit 1 fi - echo "if echo \"\$JAVA_HOME\" | grep -v \"$OT_JAVA_HOME\">/dev/null 2>&1; then export JAVA_HOME=\"$OT_JAVA_HOME\"; fi" >> "$JAVA_CONF" - echo "if echo \"\$PATH\" | grep -v \"$OT_JAVA_HOME\">/dev/null 2>&1; then export PATH=\"$OT_JAVA_HOME:\$PATH\"; fi" >> "$JAVA_CONF" - echo "if ! [ -d \"\$JAVA_HOME\" ]; then echo \"\$0: '\$OT_JAVA_HOME' is not a directory!\"; fi" >> "$JAVA_CONF" + echo 'if echo "$JAVA_HOME" | grep -v '$OT_JAVA_HOME'>/dev/null 2>&1; then export JAVA_HOME='$OT_JAVA_HOME'; fi' >> "$JAVA_CONF" + echo 'if echo "$PATH" | grep -v '$OT_JAVA_HOME/bin'>/dev/null 2>&1; then export PATH='$OT_JAVA_HOME/bin':"$PATH"; fi' >> "$JAVA_CONF" + echo 'if ! [ -d "$JAVA_HOME" ]; then echo "$0: JAVA_HOME is not a directory!"; fi' >> "$JAVA_CONF" echo "Java configuration has been stored in '$JAVA_CONF'." if ! grep "$JAVA_CONF" $OT_UI_CONF >/dev/null 2>&1; then - echo ". \"$JAVA_CONF\"" >> $OT_UI_CONF + echo ". "$JAVA_CONF"" >> $OT_UI_CONF fi fi @@ -104,8 +104,7 @@ else fi if ! grep "rbenv" $OT_UI_CONF >/dev/null 2>&1 ; then - echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> $OT_UI_CONF - echo 'eval "$(rbenv init -)"' >> $OT_UI_CONF + echo 'if ! echo "$PATH" | grep "$HOME/.rbenv/bin">/dev/null 2>&1; then export PATH="$HOME/.rbenv/bin:$PATH"; eval "$(rbenv init -)"; fi' >> $OT_UI_CONF fi cd "$DIR" -- cgit v1.2.3