From 4ce607322c31dea8f7ca7773fcb58f4fa3667b96 Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Thu, 24 Sep 2020 14:53:28 +0200
Subject: [PATCH] SSDM-9372: graphical installation disabled
---
installation/build.gradle | 3 --
installation/resource/tarball/run-console.sh | 2 +-
installation/resource/tarball/run-ui.sh | 29 --------------------
3 files changed, 1 insertion(+), 33 deletions(-)
delete mode 100755 installation/resource/tarball/run-ui.sh
diff --git a/installation/build.gradle b/installation/build.gradle
index 2fb2f13b9c2..39b46f390d9 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 3593973e0db..8dd8b38d386 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 c6faf8bb4c7..00000000000
--- 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
--
GitLab