diff --git a/swi-install.sh b/swi-install.sh index 7099690cfe937ac45cf20f90ab1142a4579db414..7c39b579afbf6ddb8ad6b66f366d48fd227a4832 100755 --- a/swi-install.sh +++ b/swi-install.sh @@ -68,6 +68,7 @@ function createLauncher(){ local icon=$4 local description=$5 local terminal=$6 + local wmclass=$7 echo '============>Creating launcher '$niceName'===========================================================================================================' if [ -n "$terminal" ] ; then terminal="true" @@ -79,6 +80,7 @@ function createLauncher(){ Version=1.0\n\ Name=$niceName\n\ Comment=$description\n\ +StartupWMClass=$wmclass\n\ Exec=$execFile\n\ Icon=$icon\n\ Terminal=$terminal\n\ @@ -210,7 +212,7 @@ EOF sudo chmod +x /opt/eclipse-$suffix/$altRunName fi fi - createLauncher eclipse-$suffix "$niceName" /opt/eclipse-$suffix/$altRunName /opt/eclipse-$suffix/$icon "$description" + createLauncher eclipse-$suffix "$niceName" /opt/eclipse-$suffix/$altRunName /opt/eclipse-$suffix/$icon "$description" false Eclipse echo '============>Eclipse '$suffix' installed.===========================================================================================================' } @@ -321,7 +323,7 @@ JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 EOF sudo chmod +x /opt/db-derby/bin/startNetworkServer-student sudo wget -O /opt/db-derby/derby-logo.png https://db.apache.org/derby/logo/final_logo.png - createLauncher java-db "Apache Derby DB (java DB)" /opt/db-derby/bin/startNetworkServer-student /opt/db-derby/derby-logo.png "Apache Derby DB (java DB)" true + createLauncher java-db "Apache Derby DB (java DB)" /opt/db-derby/bin/startNetworkServer-student /opt/db-derby/derby-logo.png "Apache Derby DB (java DB)" true derby echo '============>Apache derby DB installed.===========================================================================================================' } @@ -433,7 +435,7 @@ export JMETER_OPTS="-Dproxy.cert.directory=\$JMETER_DATA_DIR" EOF sudo chmod +x /opt/jmeter/bin/jmeter-student.sh sudo wget -O /opt/jmeter/jmeter-logo.svg https://jmeter.apache.org/images/logo.svg - createLauncher jmeter "Apache JMeter 5" /opt/jmeter/bin/jmeter-student.sh /opt/jmeter/jmeter-logo.svg "Apache JMeter 5" + createLauncher jmeter "Apache JMeter 5" /opt/jmeter/bin/jmeter-student.sh /opt/jmeter/jmeter-logo.svg "Apache JMeter 5" false "Apache JMeter" #plugin manager sudo wget -O /opt/jmeter/lib/ext/jmeter-plugins-manager-1.10.jar https://repo1.maven.org/maven2/kg/apc/jmeter-plugins-manager/1.10/jmeter-plugins-manager-1.10.jar @@ -554,7 +556,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" + createLauncher idea-IC "inteliJ IDEA" /opt/idea-IC/bin/idea.sh /opt/idea-IC/bin/idea.png "inteliJ IDEA Comunity Edition" false idea echo '============>Idea IDE installed.===========================================================================================================' } @@ -571,10 +573,10 @@ function installLombok(){ local eclipseConfigFile="/opt/eclipse-$eclipseSuffix/$eclipseName-orig.ini" local lombokLine="-javaagent:/opt/eclipse-$eclipseSuffix/lombok.jar" local lombokLineSed="-javaagent:\/opt\/eclipse-$eclipseSuffix\/lombok.jar" - sudo sed -i "/$lombokLineSed/d" $eclipseConfigFile + #sudo sed -i "/$lombokLineSed/d" $eclipseConfigFile wget https://projectlombok.org/downloads/lombok.jar sudo mv lombok.jar /opt/eclipse-$eclipseSuffix/ - cat <<EOF | sudo cat >>$eclipseConfigFile + cat <<EOF | sudo tee -a $eclipseConfigFile $lombokLine EOF } @@ -591,7 +593,7 @@ function installEclipseSTS(){ sudo sed -i -e $substituteConfig /opt/eclipse-sts/sts-3.9.5.RELEASE/configuration/config.ini fi sudo sed -i '/-Dosgi\.instance\.area\.default=/d' /opt/eclipse-sts/sts-3.9.5.RELEASE/STS.ini - createLauncher eclipse-sts "Eclipse STS" /opt/eclipse-sts/sts-3.9.5.RELEASE/STS /opt/eclipse-sts/sts-3.9.5.RELEASE/icon.xpm "Eclipse STS (Spring Tool suite)" + createLauncher eclipse-sts "Eclipse STS" /opt/eclipse-sts/sts-3.9.5.RELEASE/STS /opt/eclipse-sts/sts-3.9.5.RELEASE/icon.xpm "Eclipse STS (Spring Tool suite)" false Eclipse } function installEclipseJava(){ @@ -675,7 +677,7 @@ export ANDROID_SDK_ROOT=$LOCALHD/android-sdk-root /opt/android-studio-2020/bin/studio.sh EOF sudo chmod +x /opt/android-studio-2020/bin/studio-student.sh - createLauncher androidStudio "Android Studio" /opt/android-studio-2020/bin/studio-student.sh /opt/android-studio-2020/studio.svg "Android Studio IDE" + createLauncher androidStudio "Android Studio" /opt/android-studio-2020/bin/studio-student.sh /opt/android-studio-2020/studio.svg "Android Studio IDE" false "android" sudo mkdir -p $LOCALHD/android-sdk-root sudo chmod go+rwx $LOCALHD/android-sdk-root echo '============>Android Studio installed.==========================================================================================================='