diff --git a/installation/build.gradle b/installation/build.gradle index 2fb2f13b9c2feaf9a0c3857b7bd77ed39ca31195..39b46f390d9b8cc240c77317c14e91885edfd9f0 100644 --- a/installation/build.gradle +++ b/installation/build.gradle @@ -167,9 +167,6 @@ task createInstallerJar(type: Jar, dependsOn: [compileInstaller, jar]) { for (f in configurations.archives.files) { from zipTree(f) } - manifest { - attributes('Main-Class' : 'com.izforge.izpack.installer.bootstrap.Installer') - } } task createInstallerZip(type: Tar, dependsOn: createInstallerJar) { diff --git a/installation/resource/tarball/run-console.sh b/installation/resource/tarball/run-console.sh index 3593973e0dbe5dfb5e3ccfe4fdcccbe2eb7b6781..8dd8b38d386547ea6c91bb42b43808ea63d53112 100755 --- a/installation/resource/tarball/run-console.sh +++ b/installation/resource/tarball/run-console.sh @@ -84,4 +84,4 @@ else readAdminPassword fi -java -Djava.util.logging.config.file=$BASE/jul.config -DADMIN_PASSWORD=$ADMIN_PASSWORD -DCONSOLE=true -Dmerge.props.to.installation.vars=true -jar $BASE/openBIS-installer.jar -options-auto $BASE/console.properties +java -Djava.util.logging.config.file=$BASE/jul.config -DADMIN_PASSWORD=$ADMIN_PASSWORD -DCONSOLE=true -Dmerge.props.to.installation.vars=true -cp $BASE/openBIS-installer.jar com.izforge.izpack.installer.bootstrap.Installer -options-auto $BASE/console.properties diff --git a/installation/resource/tarball/run-ui.sh b/installation/resource/tarball/run-ui.sh deleted file mode 100755 index c6faf8bb4c7ff0253ebeeef86a4526943663199a..0000000000000000000000000000000000000000 --- a/installation/resource/tarball/run-ui.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -#Detect Java version - -if type -p java; then - _java=java -else - echo "Java not available" - exit -1 -fi - -if [[ "$_java" ]]; then - version=$("$_java" -version 2>&1 | awk -F '"' '/version/ {print $2}'| cut -c1-3) - if [[ "$version" == "1.8" || "$version" == "11." ]]; then - echo Java version $version found. - else - echo Java version $version found is neither 1.8 or 11. - exit -1 - fi -fi - -#Continue installation - -BASE=`dirname "$0"` -if [ ${BASE#/} == ${BASE} ]; then - BASE="`pwd`/${BASE}" -fi - -java -Djava.util.logging.config.file=$BASE/jul.config -jar $BASE/openBIS-installer.jar \ No newline at end of file