diff --git a/swi-install.sh b/swi-install.sh index 7c39b579afbf6ddb8ad6b66f366d48fd227a4832..fc75de2bf30f1a9dbefc0645c0688e29e2eb5640 100755 --- a/swi-install.sh +++ b/swi-install.sh @@ -66,15 +66,10 @@ function createLauncher(){ local niceName=$2 local execFile=$3 local icon=$4 - local description=$5 - local terminal=$6 + local description=${5:app} + local terminal=${6:-false} local wmclass=$7 echo '============>Creating launcher '$niceName'===========================================================================================================' - if [ -n "$terminal" ] ; then - terminal="true" - else - terminal="false" - fi printf -v launcherText "\ [Desktop Entry]\n\ Version=1.0\n\ @@ -150,7 +145,7 @@ EOF sudo sed -i "/-Dsun.java.command/a $logLevelLine" $eclipseConfigFile sudo /opt/eclipse-$suffix/$altRunName -nosplash -application org.eclipse.equinox.p2.director -repository $repos -installIU $plugins -vmargs -Dlogback.configurationFile=logback.xml -Declipse.log.level=INFO | tee plugin-install-$altRunName-$suffix.log |grep -v "] DEBUG org.apache" - + rm plugin-install-$altRunName-$suffix.log # sed -i "/$logLevelLine/d" $eclipseConfigFile } @@ -267,7 +262,7 @@ function createRunScript(){ cat <<EOF | sudo tee /opt/wildfly-33/bin/standalone-student.sh > /dev/null #!/bin/bash WILDFLY_DIR=\$HOME/.wildfly -if [ ! -d \"\$WILDFLY_DIR\" ]; then +if [ ! -d "\$WILDFLY_DIR" ]; then mkdir -p \$WILDFLY_DIR/configuration mkdir -p \$WILDFLY_DIR/content mkdir -p \$WILDFLY_DIR/data @@ -293,7 +288,7 @@ function installWildfly(){ downloadAndExtract /opt wildfly-33.0.1.Final.tar.gz wildfly-33.0.1.Final wildfly-33 https://github.com/wildfly/wildfly/releases/download/33.0.1.Final/wildfly-33.0.1.Final.tar.gz - addModule https://cdn.mysql.com//Downloads/Connector-J/mysql-connector-j-9.0.0.tar.gz com/mysql 1 com.mysql mysql-connector-java-9.0.0.jar com.mysql.cj.jdbc.MysqlXADataSource *mysql-connector-java-9.0.0.jar + addModule https://cdn.mysql.com//Downloads/Connector-J/mysql-connector-j-9.0.0.tar.gz com/mysql 1 com.mysql mysql-connector-java-9.0.0.jar com.mysql.cj.jdbc.MysqlXADataSource *mysql-connector-j-9.0.0.jar addModule https://dlcdn.apache.org//db/derby/db-derby-10.17.1.0/db-derby-10.17.1.0-lib.tar.gz org/apache/derby 2 org.apache.derby derbyclient.jar org.apache.derby.jdbc.ClientXADataSource *derbyclient.jar *derbyLocale* *derbyshared.jar *derbytools.jar @@ -556,7 +551,7 @@ function uninstallNetBeans(){ function installIdea(){ echo '============>Installing Idea IDE .....===========================================================================================================' downloadAndExtract /opt ideaIC-2024.2.0.2.tar.gz idea-IC-242.20224.419 idea-IC https://download-cdn.jetbrains.com/idea/ideaIC-2024.2.0.2.tar.gz - createLauncher idea-IC "inteliJ IDEA" /opt/idea-IC/bin/idea.sh /opt/idea-IC/bin/idea.png "inteliJ IDEA Comunity Edition" false idea + createLauncher idea-IC "inteliJ IDEA" /opt/idea-IC/bin/idea.sh /opt/idea-IC/bin/idea.png "inteliJ IDEA Comunity Edition" false jetbrains-idea-ce echo '============>Idea IDE installed.===========================================================================================================' } @@ -797,135 +792,22 @@ function installAll() { # installTomEE uninstallWildfly installWildfly - uninstallAppacheDerby - installAppacheDerby - - uninstallJMeter - installJMeter - uninstallGecko - installGecko - - installVagrant - uninstallAndroidStudio - installAndroidStudio - installDocker - installGitkraken -} - -function upgradeEclipselinkInTomEE(){ - wget http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/rt/eclipselink/releases/2.7.5/eclipselink-2.7.5.v20191016-ea124dd158.zip - unzip -j -d . eclipselink-2.7.5.v20191016-ea124dd158.zip eclipselink/jlib/eclipselink.jar - sudo mv eclipselink.jar /opt/apache-tomee-plume-8/lib/eclipselink-2.7.5.jar - sudo rm /opt/apache-tomee-plume-8/lib/eclipselink-2.6.4.jar -} - -function upgradeDerbyModuleInWildfly(){ - addModule https://www-eu.apache.org/dist//db/derby/db-derby-10.15.1.3/db-derby-10.15.1.3-lib.tar.gz org/apache/derby 2 org.apache.derby derbyclient.jar org.apache.derby.jdbc.ClientXADataSource *derbyclient.jar *derbyLocale* *derbyshared.jar *derbytools.jar - - cat <<EOF | sudo tee /opt/wildfly-20/bin/add-user-student.sh > /dev/null -#!/bin/bash -WILDFLY_DIR=\$HOME/.wildfly -/opt/wildfly-20/bin/add-user.sh -sc \$WILDFLY_DIR/configuration -EOF - sudo chmod +x /opt/wildfly-20/bin/add-user-student.sh -} - -function upgrade2023(){ - installJava - uninstallJavaFX - installJavaFX - - installGradle - - removeEclipseInstance java - installEclipseJava - - removeEclipseInstance ee - installEclipseEE -# installEclipseSTS - removeEclipseInstance papyrus - installEclipsePapyrus - - installMaven - - uninstallNetBeans - installNetBeans -# uninstallIdea -# installIdea - - uninstallTomcat -# installTomcat -# uninstallTomEE -# installTomEE - uninstallWildfly - installWildfly - uninstallAppacheDerby +# uninstallAppacheDerby installAppacheDerby - uninstallJMeter +# uninstallJMeter installJMeter - uninstallGecko +# uninstallGecko installGecko # installVagrant # uninstallAndroidStudio # installAndroidStudio # installDocker - installGitkraken -} - -function fix2023(){ - removeEclipseInstance ee - installEclipseEE - installLombok java - - cat <<EOF | sudo tee /opt/wildfly-29/bin/standalone-student.sh > /dev/null -#!/bin/bash -WILDFLY_DIR=\$HOME/.wildfly -if [ ! -d \"\$WILDFLY_DIR \" ]; then - mkdir -p \$WILDFLY_DIR/configuration - mkdir -p \$WILDFLY_DIR/content - mkdir -p \$WILDFLY_DIR/data - mkdir -p \$WILDFLY_DIR/deployments - mkdir -p \$WILDFLY_DIR/log - cp /opt/wildfly-29/standalone/configuration/* \$WILDFLY_DIR/configuration/ -fi -/opt/wildfly-29/bin/standalone.sh -Djboss.server.base.dir=\$WILDFLY_DIR -Djboss.server.temp.dir=/tmp/wildfly -EOF - -} - -function update2024(){ - installJava - - uninstallJavaFX - installJavaFX - - installMaven - - removeEclipseInstance ee - installEclipseEE - - removeEclipseInstance java - installEclipseJava - - installLombok java - installLombok ee -} - -function fix2024(){ - - removeEclipseInstance ee - installEclipseEE - - removeEclipseInstance java - installEclipseJava - - installLombok java - installLombok ee - - uninstallIdea - installIdea + installGitkraken + +# removeEclipseInstance papyrus + installEclipsePapyrus }