0.9.5

4 files changed, 39 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e29c17774d9..bd8311c9523 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
-# Generated by mksrcinfo v8
-# Tue Mar 12 14:36:54 UTC 2019
 pkgbase = mucommander
 	pkgdesc = A lightweight, cross-platform file manager with a dual-pane interface written in Java
-	pkgver = 0.9.3.3
+	pkgver = 0.9.5
 	pkgrel = 1
 	url = http://www.mucommander.com
 	arch = any
 	license = GPL
 	depends = java-runtime
 	depends = bash
-	source = mucommander-0.9.3.3.deb::https://github.com/mucommander/mucommander/releases/download/0.9.3-3/mucommander_0.9.3_all.deb
-	sha256sums = 73c39b9e4c1404ac2807982bffcaf7b0d3745291e92b1d03350a9a7ea64c42df
+	source = https://github.com/mucommander/mucommander/releases/download/0.9.5-1/mucommander-0.9.5-1.tar.gz
+	source = mucommander.png
+	source = mucommander.desktop
+	sha256sums = 0fd53ea3cf7f1a302a8cb9a889779454185006e9c66d7142b6058d236980c1c5
+	sha256sums = 2595fd4f7299750b6762a9d978feebc1e8b375a54b722391e86c972963384f55
+	sha256sums = 96672efdbb19448736c0038a55ed82d1634380499f03293bd5900194301a482f
 
 pkgname = mucommander
 
diff --git a/PKGBUILD b/PKGBUILD
index 99ae889dd38..3f384d490dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,49 +3,47 @@
 # Contributor: fi-dschi <fi-dschi_archlinux - at - arcor - dot - de>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
-
 pkgname=mucommander
-pkgver=0.9.3.3
-_pkgver=0.9.3-3
-__pkgver=0.9.3
+pkgver=0.9.5
+_pkgver=${pkgver}-1
+__pkgver=${_pkgver}
 pkgrel=1
 pkgdesc="A lightweight, cross-platform file manager with a dual-pane interface written in Java"
 url="http://www.mucommander.com"
 depends=('java-runtime' 'bash')
 arch=('any')
 license=('GPL')
-source=("${pkgname}-${pkgver}.deb::https://github.com/mucommander/mucommander/releases/download/${_pkgver}/${pkgname}_${__pkgver}_all.deb")
-sha256sums=('73c39b9e4c1404ac2807982bffcaf7b0d3745291e92b1d03350a9a7ea64c42df')
-
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
+        "${pkgname}.png" "${pkgname}.desktop")
+sha256sums=('0fd53ea3cf7f1a302a8cb9a889779454185006e9c66d7142b6058d236980c1c5'
+            '2595fd4f7299750b6762a9d978feebc1e8b375a54b722391e86c972963384f55'
+            '96672efdbb19448736c0038a55ed82d1634380499f03293bd5900194301a482f')
 
 prepare() {
-  cd $srcdir
-
-  # Extracting files
-  tar -xf data.tar.gz
-  # sed 's/\o015/\n/g' $srcdir/usr/share/$pkgname/mucommander.sh > mucommander.tmp && mv -f mucommander.tmp $srcdir/usr/share/$pkgname/mucommander.sh
-  sed -i 's|MUCOMMANDER_JAR=$CURRENT_DIR/mucommander.jar|MUCOMMANDER_JAR=/usr/share/mucommander/mucommander.jar|' $srcdir/usr/share/$pkgname/mucommander.sh
+  # Patching
+  sed -e "s|MUCOMMANDER_JAR=\$CURRENT_DIR/mucommander.jar|MUCOMMANDER_JAR=/usr/share/mucommander/mucommander-${pkgver}.jar|" -i "${srcdir}"/mucommander.sh
+  sed -e 's;java.library.path=/usr/local/lib;java.library.path=/usr/lib;' -i "${srcdir}"/mucommander.sh
 }
 
-
-
 package() {
-  cd $srcdir
-
-
   # Install jars
-  install -Dm644 ${srcdir}/usr/share/${pkgname}/${pkgname}.jar ${pkgdir}/usr/share/${pkgname}/${pkgname}.jar
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}.jar ${pkgdir}/usr/share/${pkgname}/${pkgname}-${pkgver}.jar
+
+  # budle
+  cp -r bundle app ${pkgdir}/usr/share/${pkgname}
 
   # Install license
-  install -Dm644 ${srcdir}/usr/share/${pkgname}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+  install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
 
   # Install icon
-  install -Dm644 ${srcdir}/usr/share/pixmaps/${pkgname}.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
+  install -Dm644 ${srcdir}/${pkgname}.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
 
   # Install desktop file
-  install -Dm644 ${srcdir}/usr/share/applications/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
 
   # Install run script
-  install -Dm755 ${srcdir}/usr/share/${pkgname}/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
-
+  install -Dm755 ${srcdir}/${pkgname}.sh ${pkgdir}/usr/share/${pkgname}/${pkgname}.sh
+  mkdir -m755 -p ${pkgdir}/usr/bin
+  mkdir -m777 -p ${pkgdir}/usr/share/${pkgname}/felix-cache
+  ln -sf /usr/share/${pkgname}/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
 }
diff --git a/mucommander.desktop b/mucommander.desktop
new file mode 100644
index 00000000000..1ed22d98835
--- /dev/null
+++ b/mucommander.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]

+Name=muCommander

+Comment=A lightweight, cross-platform file manager

+Exec=mucommander

+Icon=mucommander

+Terminal=false

+Type=Application

+Categories=Application;FileManager;Utility;

+StartupNotify=true

+

diff --git a/mucommander.png b/mucommander.png
new file mode 100644
index 00000000000..769f30772ed
--- /dev/null
+++ b/mucommander.png