diff --git a/screening/dist/tarball/run-console.sh b/screening/dist/tarball/run-console.sh index 3d213ad9b0334177396e971601c51e72945b97e5..8d0ee39f10eae816450c32fbb506093976a15ed2 100755 --- a/screening/dist/tarball/run-console.sh +++ b/screening/dist/tarball/run-console.sh @@ -12,7 +12,7 @@ function readAdminPassword() read -s -p "Re-type password for openBIS 'admin' user : " ADMIN_PASSWORD2 echo "" - if [ "$ADMIN_PASSWORD" -ne "$ADMIN_PASSWORD2" ]; then + if [ "$ADMIN_PASSWORD" != "$ADMIN_PASSWORD2" ]; then echo "Administrator passwords do not match. Aborting installation." exit 2 fi @@ -49,6 +49,13 @@ if [ -z "$install_path" ]; then exit 1 fi +dss_root_dir=$( grep -e "^DSS.ROOT-DIR=.*$" $BASE/console.properties | sed "s/DSS.ROOT-DIR=//" ) +if [ -z "$dss_root_dir" ]; then + echo "The property DSS.ROOT-DIR= must be configured in $BASE/console.properties." + echo "Please edit the file and run the installation script again." + exit 1 +fi + ensureToolOnPath "java" ensureToolOnPath "psql" ensureToolOnPath "pg_dump"