diff options
| author | Andreas Maunz <andreas@maunz.de> | 2011-04-02 15:32:29 +0200 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2011-04-02 15:32:29 +0200 |
| commit | c3496282449215855acb5c083c20a1782803617a (patch) | |
| tree | 7a8bc774d5554665be85f4d982491839bf996f16 /base-install.sh | |
| parent | 438de29fbd0ddf20c0b4acac1fa70d7ce58a62b8 (diff) | |
Replaced substring matching by grep
Diffstat (limited to 'base-install.sh')
| -rwxr-xr-x | base-install.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base-install.sh b/base-install.sh index 7fdb824..60e4715 100755 --- a/base-install.sh +++ b/base-install.sh @@ -26,7 +26,7 @@ fi # 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" +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 libreadline-5.dev" echo echo "Base Packages:" @@ -81,8 +81,8 @@ if [ ! -f $JAVA_CONF ]; then exit 1 fi - echo "if ! [[ \"\$JAVA_HOME\" =~ \"$JAVA_HOME\" ]]; then export JAVA_HOME=\"$JAVA_HOME\"; fi" >> "$JAVA_CONF" - echo "if ! [[ \"\$PATH\" =~ \"$JAVA_HOME\" ]]; then export PATH=\"$JAVA_HOME:\$PATH\"; fi" >> "$JAVA_CONF" + echo "if echo \"\$JAVA_HOME\" | grep -v \"$JAVA_HOME\">/dev/null 2>&1; then export JAVA_HOME=\"$JAVA_HOME\"; fi" >> "$JAVA_CONF" + 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 |