Fix snapd naming collision and other suggestions by gewaaid.

5 files changed, 66 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6af7d67d7209..5319762da9da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = esa-snap-bin
 	pkgdesc = ESA SNAP Toolbox for Sentinel Satellite data
 	pkgver = 9.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://step.esa.int/main/
 	arch = x86_64
 	license = GPL3
@@ -13,13 +13,16 @@ pkgbase = esa-snap-bin
 	source = snap-conf-optimiser.desktop
 	source = snap-desktop.desktop
 	source = response.varfile
+	source = esa-snap-desktop.png
 	md5sums = d7db246ed952832261b4bdae98a03246
-	md5sums = cc4814b417fba1c6ce2782654b18d8b8
-	md5sums = b30e02a81cce3370eb9e04ce4caee040
+	md5sums = 29553527b1347b404ee9f132f0928025
+	md5sums = 173a97ca7af76079bacbbee667fd5013
 	md5sums = 171e808a3ba22fb6a522aa318a8703db
+	md5sums = 5adb217028dbe9d6e1aea75412b81a7d
 	sha256sums = ad6ef8c679c80c58660fe23ab5fb4974f9cd3ff4b119ad8e7e40dc79dbe03896
-	sha256sums = bc705ce50143ee597485f1dbbef0e62794c62af781c4af71db2f304b34c7ee01
-	sha256sums = 8d07671f6e94250ac333a34f1c8288f09e89428cbe9bf9c2af4a5226182cc2f9
+	sha256sums = 1fb2161e9d0bc16093a193ff2008c89c0a788053ce448f3e248b9cd9998998e0
+	sha256sums = e02744cd13df4aed9cd5e8f81ef59d35a44e00eb2a0ddce9587d71b3adcf9192
 	sha256sums = 97f680aec00cc74ec2f202aba1e0132c461d631d705203ab613371c9c4c28f2d
+	sha256sums = 83d4cc2d0d2f5f21295eab6511be0dc7d5773b5b2460f61b52ac6b0200f1872e
 
 pkgname = esa-snap-bin
diff --git a/PKGBUILD b/PKGBUILD
index 5918b858a520..d32f7c202605 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,76 @@
 # Maintainer: Audun-Marius Gangstø <audun@gangsto.org>
 pkgname=esa-snap-bin
 pkgver=9.0.0
-pkgrel=1
-pkgdesc="ESA SNAP Toolbox for Sentinel Satellite  data"
+pkgrel=2
+pkgdesc="ESA SNAP Toolbox for Sentinel Satellite data"
 arch=("x86_64")
 url="http://step.esa.int/main/"
 license=('GPL3')
 options=("!strip")
 provides=("esa-snap")
 depends=("java-runtime=8")
+# Official download page: http://step.esa.int/main/download/snap-download/
 source=("https://download.esa.int/step/snap/${pkgver:0:3}/installers/${pkgname/-bin/}_all_unix_${pkgver//./_}.sh"
-	"snap-conf-optimiser.desktop"
-	"snap-desktop.desktop"
-	"response.varfile"
+    "snap-conf-optimiser.desktop"
+    "snap-desktop.desktop"
+    "response.varfile"
+    "esa-snap-desktop.png"
         )
 noextract=("${pkgname/-bin/}_all_unix_${pkgver//./_}.sh")
 md5sums=("d7db246ed952832261b4bdae98a03246"
-         "cc4814b417fba1c6ce2782654b18d8b8"
-         "b30e02a81cce3370eb9e04ce4caee040"
+         "29553527b1347b404ee9f132f0928025"
+         "173a97ca7af76079bacbbee667fd5013"
          "171e808a3ba22fb6a522aa318a8703db"
+         "5adb217028dbe9d6e1aea75412b81a7d"
 )
 sha256sums=("ad6ef8c679c80c58660fe23ab5fb4974f9cd3ff4b119ad8e7e40dc79dbe03896"
-            "bc705ce50143ee597485f1dbbef0e62794c62af781c4af71db2f304b34c7ee01"
-            "8d07671f6e94250ac333a34f1c8288f09e89428cbe9bf9c2af4a5226182cc2f9"
+            "1fb2161e9d0bc16093a193ff2008c89c0a788053ce448f3e248b9cd9998998e0"
+            "e02744cd13df4aed9cd5e8f81ef59d35a44e00eb2a0ddce9587d71b3adcf9192"
             "97f680aec00cc74ec2f202aba1e0132c461d631d705203ab613371c9c4c28f2d"
+            "83d4cc2d0d2f5f21295eab6511be0dc7d5773b5b2460f61b52ac6b0200f1872e"
 )
 
 
 package() {
-	cd "$srcdir"
-	install -d "${pkgdir}/opt/"
-	install -d "${pkgdir}/usr/bin"
-	install -d "${pkgdir}/usr/share/icons"
-	install -d "${pkgdir}/usr/share/applications"
-	
-	# java.util.prefs.userRoot is set to silence some warnings during install. We have to delete it afterwards
-	sh "${pkgname/-bin/}_all_unix_${pkgver//./_}.sh" -q -dir "${pkgdir}/opt/snap" -J-Djava.util.prefs.userRoot="${pkgdir}/" -Vsys.symlinkDir=${pkgdir}/usr/bin
-
-	
-	install -Dm 644 "${srcdir}"/snap-desktop.desktop "${pkgdir}"/usr/share/applications
-	install -Dm 644 "${srcdir}"/snap-conf-optimiser.desktop "${pkgdir}"/usr/share/applications
-
-	cp "${pkgdir}"/opt/snap/.install4j/i4j_extf_5_1buu1c8.jpg "${pkgdir}"/usr/share/icons/esa-snap-desktop.jpg
-	# This icon file is somehow truncated.
-	cp "${pkgdir}"/opt/snap/.install4j/i4j_extf_3_1buu1c8.jpg "${pkgdir}"/opt/snap/bin/SNAP_icon_48.jpg
-	cp "${pkgdir}"/opt/snap/.install4j/snap-conf-optimiser.png "${pkgdir}"/usr/share/icons/snap-conf-optimiser.png
-	# Set -Xmx to two thirds of system memory. Seems to be what the installer does.
-	maxmem="$(awk '/MemTotal/{print int(($2/1024^2) * .7)}' /proc/meminfo)"
-	sed "s/-Xmx[^ ]*/-Xmx${maxmem}G/;s#^jdkhome.*#jdkhome=\"/usr/lib/jvm/java-8-openjdk/jre/\"#" -i "${pkgdir}"/opt/snap/etc/snap.conf
-
-
-	# Deleting java user root and uninstaller, both related to the uninstaller.
-	# Also removing the accompanying jre. 
-	rm -rf "${pkgdir}"/.java "${pkgdir}"/opt/snap/.install4j "${pkgdir}"/opt/snap/jre
+    cd "$srcdir"
+    installdir="/opt/esa-snap"
+    jvm_home="/usr/lib/jvm/java-8-openjdk/jre/"
+    install -d "${pkgdir}/opt/"
+    install -d "${pkgdir}/usr/bin"
+    install -d "${pkgdir}/usr/share/icons"
+    install -d "${pkgdir}/usr/share/applications"
 
+    # java.util.prefs.userRoot is set to silence some warnings during install. We have to delete it afterwards
+    sh "${pkgname/-bin/}_all_unix_${pkgver//./_}.sh" -q -dir "${pkgdir}/${installdir}" -J-Djava.util.prefs.userRoot="${pkgdir}/" -Vsys.symlinkDir=${pkgdir}/usr/bin
+
+    # Desktop files refer to the installed directory:
+    sed "s#INSTALLDIR#${installdir}#" "${srcdir}"/snap-desktop.desktop        > "${srcdir}"/fixed-snap-desktop.desktop
+    sed "s#INSTALLDIR#${installdir}#" "${srcdir}"/snap-conf-optimiser.desktop > "${srcdir}"/fixed-snap-conf-optimiser.desktop
+
+    install -Dm 644 "${srcdir}"/fixed-snap-desktop.desktop        "${pkgdir}"/usr/share/applications/esa-snap-desktop.desktop
+    install -Dm 644 "${srcdir}"/fixed-snap-conf-optimiser.desktop "${pkgdir}"/usr/share/applications/esa-snap-conf-optimiser.desktop
+    install -Dm 644 "${srcdir}"/esa-snap-desktop.png              "${pkgdir}"/usr/share/icons/esa-snap-desktop.png
+
+    install -Dm 644 "${pkgdir}"/"${installdir}"/.install4j/i4j_extf_3_1buu1c8.jpg  "${pkgdir}"/"${installdir}"/bin/SNAP_icon_48.jpg
+    install -Dm 644 "${pkgdir}"/"${installdir}"/.install4j/snap-conf-optimiser.png "${pkgdir}"/usr/share/icons/snap-conf-optimiser.png
+
+    # Set -Xmx to two thirds of system memory. Seems to be what the installer does.
+    maxmem="$(awk '/MemTotal/{print int(($2/1024^2) * .7)}' /proc/meminfo)"
+    sed "s/-Xmx[^ ]*/-Xmx${maxmem}G/" -i "${pkgdir}"/"${installdir}"/etc/snap.conf
+
+    # Change JDK to the one provided by the distro
+    sed "s#^jdkhome.*#jdkhome=\"${jvm_home}\"#" -i "${pkgdir}"/"${installdir}"/etc/snap.conf
+
+    # Keep files required for snap-conf-optimiser
+    mv "${pkgdir}"/"${installdir}"/.install4j "${pkgdir}"/"${installdir}"/.uninstall4j/
+    for jar in $(cat "${pkgdir}"/"${installdir}"/bin/snap-conf-optimiser |sed -n '/^i4j_classpath/{s/:.*install4j./ /;s/.*install4j.//;s/"$//p}'); do
+        install -Dm 644 "${pkgdir}"/"${installdir}"/.uninstall4j/"${jar}" "${pkgdir}"/"${installdir}"/.install4j/"${jar}"
+    done
+    echo "${jvm_home}" >  "${pkgdir}/${installdir}/".install4j/pref_jre.cfg;
+
+    # Deleting java user root
+    # Also removing the accompanying jre. 
+    rm -r "${pkgdir}"/.java "${pkgdir}"/"${installdir}"/jre "${pkgdir}"/"${installdir}"/.uninstall4j/
+    # Clean up desktop files
+    rm "${pkgdir}"/"${installdir}"/'SNAP Configuration Optimiser.desktop' "${pkgdir}"/"${installdir}"/'SNAP Desktop.desktop'
 }
diff --git a/esa-snap-desktop.png b/esa-snap-desktop.png
new file mode 100644
index 000000000000..9abdbfc84713
--- /dev/null
+++ b/esa-snap-desktop.png
diff --git a/snap-conf-optimiser.desktop b/snap-conf-optimiser.desktop
index 48be8e9a627e..2eedea92d27a 100644
--- a/snap-conf-optimiser.desktop
+++ b/snap-conf-optimiser.desktop
@@ -1,8 +1,8 @@
 #!/usr/bin/env xdg-open
 [Desktop Entry]
 Type=Application
-Name=SNAP Configuration Optimiser
-Exec="/opt/snap/bin/snap-conf-optimiser" %U
+Name=ESA SNAP Configuration Optimiser
+Exec="INSTALLDIR/bin/snap-conf-optimiser" %U
 Icon=snap-conf-optimiser
 Categories=Education;Science;Geography;
 StartupWMClass=install4j-org-esa-snap-smart-configurator-ui-SmartConfigurator
diff --git a/snap-desktop.desktop b/snap-desktop.desktop
index ae2ddaacabb8..fbfd1b790121 100644
--- a/snap-desktop.desktop
+++ b/snap-desktop.desktop
@@ -1,7 +1,8 @@
 #!/usr/bin/env xdg-open
 [Desktop Entry]
 Type=Application
-Name=SNAP Desktop
-Exec=/bin/sh "/opt/snap/bin/snap" %U
+Name=ESA SNAP Desktop
+Exec=/bin/sh "INSTALLDIR/bin/snap" %U
 Categories=Education;Science;Geography;
 Icon=esa-snap-desktop
+StartupWMClass=SNAP