Added aarch64 version, changed systemd service to user, general cleaning of PKGBUILD

6 files changed, 86 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8096caa9ac12..09295912debc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,30 @@
-# Generated by mksrcinfo v8
-# Sun Dec  2 16:18:20 UTC 2018
 pkgbase = minimserver
 	pkgdesc = UPnP Audio Server
 	pkgver = 0.8.5.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.minimserver.com
 	install = minimserver.install
 	arch = x86_64
+	arch = aarch64
 	license = custom:minimserver
 	depends = jre8-openjdk
 	depends = bash
-	source = https://www.audio-linux.com/ftp/packages/MinimServer-0.8.5.2-x64.apk
-	source = minimserver@.service
-	source = https://www.audio-linux.com/ftp/packages/minimserver_bin.tar.gz
-	sha256sums = SKIP
-	sha256sums = 1242041a76ce3296a426602c3ab7944ba810eb7152370cc54620b51e2e2813f8
-	sha256sums = 11568572b615fc096da58792af8e95e736b2d07b36913aa659184ed755b9a890
+	source_x86_64 = http://jminim.com/brac/MinimServer-0.8.5.2-linux-intel.tar.gz
+	source_x86_64 = minimserver.service
+	source_x86_64 = startd
+	source_x86_64 = stopall
+	sha256sums_x86_64 = SKIP
+	sha256sums_x86_64 = bf4aa3138405551d56799a46853c5aec3a5fa596535623945ea03fc9dcba60e7
+	sha256sums_x86_64 = b62defecce18a435d01a516c9f00005372eef402697df1c7fc61f0a661c81819
+	sha256sums_x86_64 = 3eb10e9e28b08b708e02328661ffe8810ae1e0fc653c396c41e4cd15d393dfea
+	source_aarch64 = http://jminim.com/brac/MinimServer-0.8.5.2-linux-arm64.tar.gz
+	source_aarch64 = minimserver.service
+	source_aarch64 = startd
+	source_aarch64 = stopall
+	sha256sums_aarch64 = SKIP
+	sha256sums_aarch64 = bf4aa3138405551d56799a46853c5aec3a5fa596535623945ea03fc9dcba60e7
+	sha256sums_aarch64 = b62defecce18a435d01a516c9f00005372eef402697df1c7fc61f0a661c81819
+	sha256sums_aarch64 = 3eb10e9e28b08b708e02328661ffe8810ae1e0fc653c396c41e4cd15d393dfea
 
 pkgname = minimserver
 
diff --git a/PKGBUILD b/PKGBUILD
index 2f30bbb65680..1fd59630b30d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,26 @@
 
 pkgname=minimserver
 pkgver=0.8.5.2
-pkgrel=2
+pkgrel=3
 pkgdesc="UPnP Audio Server"
-arch=('x86_64')
+arch=('x86_64' 'aarch64')
 url="http://www.minimserver.com"
 license=('custom:minimserver')
 depends=('jre8-openjdk' 'bash')
 install=${pkgname}.install
-source=("https://www.audio-linux.com/ftp/packages/MinimServer-${pkgver}-x64.apk" "minimserver@.service" "https://www.audio-linux.com/ftp/packages/minimserver_bin.tar.gz")
-sha256sums=('SKIP' '1242041a76ce3296a426602c3ab7944ba810eb7152370cc54620b51e2e2813f8'
-'11568572b615fc096da58792af8e95e736b2d07b36913aa659184ed755b9a890')
+source_aarch64=("http://jminim.com/brac/MinimServer-$pkgver-linux-arm64.tar.gz" "minimserver.service" "startd" "stopall")
+source_x86_64=("http://jminim.com/brac/MinimServer-$pkgver-linux-intel.tar.gz" "minimserver.service" "startd" "stopall")
+sha256sums_aarch64=('SKIP' 'bf4aa3138405551d56799a46853c5aec3a5fa596535623945ea03fc9dcba60e7' 'b62defecce18a435d01a516c9f00005372eef402697df1c7fc61f0a661c81819' '3eb10e9e28b08b708e02328661ffe8810ae1e0fc653c396c41e4cd15d393dfea')
+sha256sums_x86_64=('SKIP' 'bf4aa3138405551d56799a46853c5aec3a5fa596535623945ea03fc9dcba60e7' 'b62defecce18a435d01a516c9f00005372eef402697df1c7fc61f0a661c81819' '3eb10e9e28b08b708e02328661ffe8810ae1e0fc653c396c41e4cd15d393dfea')
 
 package() {
-  cd ${srcdir}
+  cd $srcdir
   
-  mkdir -p ${pkgdir}/opt/minimserver/icons
-  mkdir -p -m 777 ${pkgdir}/opt/minimserver/tmp/
-  bsdtar xf data.tar.gz -C "${pkgdir}/opt/minimserver"
-  rm -rf ${pkgdir}/opt/minimserver/libext
-  rm -rf ${pkgdir}/opt/minimserver/libsys
-  rm ${pkgdir}/opt/minimserver/bin/startd
-  rm ${pkgdir}/opt/minimserver/bin/stopall
-  install -Dm755 ${srcdir}/bin_modified/startd ${pkgdir}/opt/minimserver/bin/startd
-  install -Dm755 ${srcdir}/bin_modified/stopall ${pkgdir}/opt/minimserver/bin/stopall
-  install -Dm644 ${srcdir}/bin_modified/server48.png ${pkgdir}/opt/minimserver/icons/server48.png
-  install -Dm644 ${srcdir}/bin_modified/MinimServer.desktop ${pkgdir}/opt/minimserver/icons/MinimServer.desktop
-  install -Dm644 "minimserver@.service" \
-  "$pkgdir/usr/lib/systemd/system/minimserver@.service"
+  mkdir -p -m 777 $pkgdir/opt/minimserver/tmp/
+  cp -r $srcdir/$pkgname/$pkgname-$pkgver/* "$pkgdir/opt/minimserver/"
+  rm $pkgdir/opt/minimserver/bin/startd
+  rm $pkgdir/opt/minimserver/bin/stopall
+  install -Dm755 startd ${pkgdir}/opt/minimserver/bin/startd
+  install -Dm755 stopall ${pkgdir}/opt/minimserver/bin/stopall
+  install -Dm644 "minimserver.service" $pkgdir/usr/lib/systemd/user/minimserver.service
 }
diff --git a/minimserver.install b/minimserver.install
index eb4a9297794c..232cb6940b66 100644..100755
--- a/minimserver.install
+++ b/minimserver.install
@@ -17,10 +17,10 @@ To stop minimserver
 (you can use also the desktop file at /opt/minimserver/icons/MinimServer.desktop)
 
 To start minimserver, you could also start the service unit file:
-  # systemctl start minimserver@<user>
+  # systemctl --user start minimserver
 
 To enable minimserver at boot:
-  # systemctl enable minimserver@<user>
+  # systemctl --user enable minimserver
   
 To complete the configuration once the service has been started, point
 your web browser to:
diff --git a/minimserver@.service b/minimserver.service
index f5db00a0f5d6..664bdb66da65 100644..100755
--- a/minimserver@.service
+++ b/minimserver.service
@@ -1,11 +1,12 @@
 [Unit]
-Description=MinimServer
+Description=MinimServer UPnP music server
+Requires=sound.target
+After=sound.target
 
 [Service]
-User=%I
 RemainAfterExit=true
 ExecStart=/opt/minimserver/bin/startd
 ExecStop=/opt/minimserver/bin/stopall
 
 [Install]
-WantedBy=network.target
\ No newline at end of file
+WantedBy=default.target
diff --git a/startd b/startd
new file mode 100755
index 000000000000..ad9b4136ebc2
--- /dev/null
+++ b/startd
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+MINIM_HOME="/opt/minimserver"
+MINIM_DATA="/home/$USER/.minimserver/data"
+cd "$MINIM_DATA"
+if [ -z "$LANG" ]; then
+    export LANG="en_US.utf8"
+fi
+MINIM_LANG="$LANG" java -jar "$MINIM_HOME/lib/mserver.jar" --noconsole --nohup </dev/null >minimserver.out 2>&1 &
+
+exit
diff --git a/stopall b/stopall
new file mode 100755
index 000000000000..5cfdaeb8cc83
--- /dev/null
+++ b/stopall
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+echo "Checking for running instances of MinimServer..."
+while :
+do
+    PID="$(ps -ef | grep mserver\\.jar | awk '{ print $2 }')"
+    if [ "$PID" = "" ]; then
+        break
+    fi
+    if [ "$PID" != "$KILLPID" ]; then
+        echo "Stopping MinimServer process $PID"
+        kill_time=0
+        max_kill_time=10
+        force=""
+        KILLPID=$PID
+        kill $KILLPID || break
+    else
+        if [ $kill_time -eq $max_kill_time ]; then
+            if [ -z "$force" ]; then
+                echo "Forcibly stopping MinimServer process $PID"
+                max_kill_time=15
+                force="-9"
+                kill $force $KILLPID || break
+            else
+                echo "Unable to stop MinimServer process $PID" 1>&2
+                exit 1
+            fi
+        fi
+    fi
+    kill_time=$(($kill_time+1))
+    sleep 1
+done
+if [ -z "$KILLPID" ]; then
+    echo "No MinimServer instances are running"
+fi
+
+exit 0