diff options
-rw-r--r-- | base-install.sh | 16 | ||||
-rwxr-xr-x | config.sh | 28 | ||||
-rwxr-xr-x | install | 4 | ||||
-rwxr-xr-x | openbabel.sh | 2 | ||||
-rw-r--r-- | redis.sh | 2 | ||||
-rwxr-xr-x | utils.sh | 12 |
6 files changed, 32 insertions, 32 deletions
diff --git a/base-install.sh b/base-install.sh index 13d0dd3..524283a 100644 --- a/base-install.sh +++ b/base-install.sh @@ -35,9 +35,9 @@ echo "Base Packages:" pack_arr="" for p in $packs; do if $DPKG -s "$p" >/dev/null 2>&1; then - printf "%25s%15s\n" "'$p'" "Y" + printf "%50s%30s\n" "'$p'" "Y" else - printf "%25s%15s\n" "'$p'" "N" + printf "%50s%30s\n" "'$p'" "N" pack_arr="$pack_arr $p" fi done @@ -51,9 +51,9 @@ fi for p in $pack_arr; do if [ -n "`$APT_CACHE search $p`" ] ; then - printf "%25s%15s\n" "'$p'" "Y" + printf "%50s%30s\n" "'$p'" "Y" else - printf "%25s%15s\n" "'$p'" "N" + printf "%50s%30s\n" "'$p'" "N" pack_fail="$pack_fail $p" fi done @@ -77,13 +77,13 @@ done if [ ! -f $JAVA_CONF ]; then - if [ ! -d "$JAVA_HOME" ]; then - echo "Directory '$JAVA_HOME' does not exist! Aborting..." + if [ ! -d "$OT_JAVA_HOME" ]; then + echo "Directory '$OT_JAVA_HOME' does not exist! Aborting..." exit 1 fi - 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 "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\"; then export PATH=\"$OT_JAVA_HOME:\$PATH\"; fi" >> "$JAVA_CONF" echo "Java configuration has been stored in '$JAVA_CONF'." if ! grep "$JAVA_CONF" $OT_UI_CONF >/dev/null 2>&1; then @@ -10,8 +10,8 @@ OT_INSTALL="local" # Type (gem, local, server) OT_BRANCH="master" # Maturity (development, master) # 2) Where all binaries are installed. -PREFIX="$HOME/opentox" -JAVA_HOME="/usr/lib/jvm/java-6-sun" +OT_PREFIX="$HOME/opentox" +OT_JAVA_HOME="/usr/lib/jvm/java-6-sun" # 3) What versions to install. RUBY_NUM_VER="1.8.7-2011.03" @@ -21,29 +21,29 @@ REDIS_NUM_VER="2.2.2" # 4) Server settings. NGINX_SERVERNAME="localhost" -WWW_DEST="$PREFIX/www" +WWW_DEST="$OT_PREFIX/www" # Done. ### Nothing to gain from changes below this line. -JAVA_CONF="$PREFIX/.bash_java_ot" -RUBY_CONF="$PREFIX/.bash_ruby_ot" -REDIS_CONF="$PREFIX/.bash_redis_ot" -OB_CONF="$PREFIX/.bash_OB_ot" -KL_CONF="$PREFIX/.bash_R_ot" +JAVA_CONF="$OT_PREFIX/.bash_java_ot" +RUBY_CONF="$OT_PREFIX/.bash_ruby_ot" +REDIS_CONF="$OT_PREFIX/.bash_redis_ot" +OB_CONF="$OT_PREFIX/.bash_OB_ot" +KL_CONF="$OT_PREFIX/.bash_R_ot" RUBY_VER="ruby-enterprise-$RUBY_NUM_VER" OB_VER="openbabel-$OB_NUM_VER" KL_VER="$KL_NUM_VER" REDIS_VER="$REDIS_NUM_VER" -RUBY_DEST="$PREFIX/$RUBY_VER" -OB_DEST="$PREFIX/$OB_VER" -OB_DEST_BINDINGS="$PREFIX/openbabel-ruby-install" -KL_DEST="$PREFIX/r-packages" -NGINX_DEST="$PREFIX/nginx" -REDIS_DEST="$PREFIX/redis-$REDIS_VER" +RUBY_DEST="$OT_PREFIX/$RUBY_VER" +OB_DEST="$OT_PREFIX/$OB_VER" +OB_DEST_BINDINGS="$OT_PREFIX/openbabel-ruby-install" +KL_DEST="$OT_PREFIX/r-packages" +NGINX_DEST="$OT_PREFIX/nginx" +REDIS_DEST="$OT_PREFIX/redis-$REDIS_VER" REDIS_SERVER_CONF="$REDIS_DEST/redis.conf" OT_UI_CONF="$HOME/.opentox-ui.sh" @@ -6,7 +6,7 @@ LOG="/tmp/`basename $0`-log.txt" . "./utils.sh" echo echo "Opentox-ruby installation." -echo "You may need to give root password for some privileged actions right now:" +echo "You may need to give root password for some privileged actions right now and later:" cmd="sudo echo -n \"\"" && run_cmd "$cmd" "Acquire privileges" . "./base-install.sh" @@ -23,7 +23,7 @@ then fi echo -echo "Installation finished and configured." +echo "Installation to '$OT_DEST' finished and configured." echo echo "IMPORTANT:" echo "Include the file '$OT_UI_CONF' in your shell or system startup to have it automatically configured." diff --git a/openbabel.sh b/openbabel.sh index 40c34ec..a806862 100755 --- a/openbabel.sh +++ b/openbabel.sh @@ -57,7 +57,7 @@ if [ ! -f "$OB_CONF" ]; then echo "if echo \"\$LD_LIBRARY_PATH\" | grep -v \"$OB_DEST\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"$OB_DEST/lib:\$LD_LIBRARY_PATH\"; fi" >> "$OB_CONF" echo "if [ -z \"\$BABEL_LIBDIR\" ]; then export BABEL_LIBDIR=\"$OB_DEST/lib/openbabel/2.3.0\"; fi" >> "$OB_CONF" echo "if [ -z \"\$BABEL_DATADIR\" ]; then export BABEL_DATADIR=\"$OB_DEST/share/openbabel/2.3.0\"; fi" >> "$OB_CONF" - echo "if echo \"\$RUBYLIB | grep -v \"$OB_DEST_BINDINGS\">/dev/null 2>&1; then export RUBYLIB=\"$OB_DEST_BINDINGS:\$RUBYLIB\"; fi" >> "$RUBY_CONF" + echo "if echo \"\$RUBYLIB\" | grep -v \"$OB_DEST_BINDINGS\">/dev/null 2>&1; then export RUBYLIB=\"$OB_DEST_BINDINGS:\$RUBYLIB\"; fi" >> "$RUBY_CONF" echo "Openbabel configuration has been stored in '$OB_CONF'." if ! grep "$OB_CONF" $OT_UI_CONF >/dev/null 2>&1 ; then @@ -39,7 +39,7 @@ fi if ! $REDIS_DONE; then echo "vm.overcommit_memory = 1" | sudo tee -a /etc/sysctl.conf >>$LOG 2>&1 - cd $PREFIX + cd $OT_PREFIX URI="http://redis.googlecode.com/files/redis-$REDIS_VER.tar.gz" if ! [ -d "redis-$REDIS_VER" ]; then cmd="$WGET $URI" && run_cmd "$cmd" "Download" @@ -2,9 +2,9 @@ check_dest() { - if ! [ -d "$PREFIX" ]; then - if ! mkdir -p "$PREFIX"; then - echo "Could not create target directory '$PREFIX'! Aborting..." + if ! [ -d "$OT_PREFIX" ]; then + if ! mkdir -p "$OT_PREFIX"; then + echo "Could not create target directory '$OT_PREFIX'! Aborting..." exit 1 fi fi @@ -15,12 +15,12 @@ run_cmd () local cmd="$1" local title="$2" - printf "%15s" "'$title'" + printf "%30s" "'$title'" if ! eval $cmd >>$LOG 2>&1 ; then - printf "%25s\n" "FAIL" + printf "%50s\n" "FAIL" exit 1 fi - printf "%25s\n" "DONE" + printf "%50s\n" "DONE" } |