diff options
| author | Andreas Maunz <andreas@maunz.de> | 2011-03-30 16:22:35 +0200 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2011-03-30 16:22:35 +0200 |
| commit | f76f11eaf435397607f2aa5e70496c01005d5c6b (patch) | |
| tree | e819076fcbaa0b777f48801b5a289dbe5bc4f1a7 | |
| parent | 16cfa7f673220db44079443dcd8a7f2585a6fba5 (diff) | |
base-install
| -rwxr-xr-x | base-install.sh | 9 | ||||
| -rw-r--r-- | config.sh | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/base-install.sh b/base-install.sh index a61537d..35591a9 100755 --- a/base-install.sh +++ b/base-install.sh @@ -21,6 +21,7 @@ fi # Dest source ./config.sh +source ./utils.sh # 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" @@ -89,10 +90,6 @@ echo echo "Preparing JAVA..." if [ ! -f $JAVA_CONF ]; then - echo -n "Please provide a path for JAVA_HOME (hint: type echo \$JAVA_HOME as normal user): " - read USER_SUBMITTED_JAVA_HOME - JAVA_HOME="$USER_SUBMITTED_JAVA_HOME" - if [ ! -d "$JAVA_HOME" ]; then echo "Directory '$JAVA_HOME' does not exist! Aborting..." exit 1 @@ -102,9 +99,7 @@ if [ ! -f $JAVA_CONF ]; then echo "export PATH=$JAVA_HOME:\$PATH" >> "$JAVA_CONF" echo "Java configuration has been stored in '$JAVA_CONF'." - echo -n "Answer 'y' if Java configuration should be linked to your .bashrc: " - read ANSWER_JAVA_CONF - if [ $ANSWER_JAVA_CONF = "y" ]; then + if ! grep "$JAVA_CONF" $HOME/.bashrc; then echo "source \"$JAVA_CONF\"" >> $HOME/.bashrc fi @@ -6,6 +6,7 @@ # 1) Where all binaries are installed. PREFIX="$HOME/opentox" +JAVA_HOME="/usr/lib/java-6-sun" # 2) What versions to install. RUBY_NUM_VER="1.8.7-2011.03" @@ -13,7 +14,7 @@ OB_NUM_VER="2.2.3" KL_NUM_VER="0.9-11" REDIS_NUM_VER="2.2.2" -# 3) What server settings. +# 3) Server settings. NGINX_SERVERNAME="localhost" WWW_DEST="$PREFIX/www" |