diff options
author | Andreas Maunz <andreas@maunz.de> | 2013-02-17 16:21:37 +0100 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2013-02-17 16:21:37 +0100 |
commit | 2743068f2930fed2b2d64c0eba6e33f63634ed7a (patch) | |
tree | e449fcdb59c716432f15c750360b03ccfc997d94 /base-install | |
parent | 04303b88d749a10a481ece22812c9a360ee30904 (diff) | |
parent | 58f25b5b123331ac5480f34073a63e430370e0dc (diff) |
Merge branch 'development' of github.com:opentox/install into development
Diffstat (limited to 'base-install')
-rwxr-xr-x | base-install | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/base-install b/base-install index 444d7f9..44abffd 100755 --- a/base-install +++ b/base-install @@ -28,6 +28,7 @@ if ! cat "/etc/apt/sources.list" | grep "$REDLAND_DEB">/dev/null 2>&1; then fi sudo $APTITUDE update -y >/dev/null 2>&1 +sudo $APTITUDE upgrade -y >/dev/null 2>&1 DISTRIB_INFO=$(cat /proc/version) @@ -37,6 +38,7 @@ case "$DISTRIB_INFO" in *) PACK_LIST="debian.list";; esac +sudo $APTITUDE update -y >/dev/null 2>&1 sudo $DPKG --set-selections < "$PACK_LIST" sudo $APT_GET -y --force-yes -u dselect-upgrade @@ -44,6 +46,8 @@ if [ ! -f $JAVA_CONF ]; then if [ ! -d "$OT_JAVA_HOME" ]; then echo "Directory '$OT_JAVA_HOME' does not exist! Aborting..." + echo "Please check if openjdk-6-jdk has been installed properly." + echo "You may need to set the OT_JAVA_HOME variable in config.sh to the correct path on your system." exit 1 fi |