Fix: Bump version to 4.1.2

Fix: Archlinux PKGBUILD checksums and install script #45
Fix: Debian packaging #54

CMakeLists.txt

@@ -4,10 +4,10 @@ project (mympd C)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 set(CPACK_PACKAGE_VERSION_MAJOR "4")
 set(CPACK_PACKAGE_VERSION_MINOR "1")
-set(CPACK_PACKAGE_VERSION_PATCH "1")
+set(CPACK_PACKAGE_VERSION_PATCH "2")
 
 if(CMAKE_BUILD_TYPE MATCHES RELEASE)
-    set(ASSETS_PATH "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/htdocs")
+    set(ASSETS_PATH "/usr/share/${PROJECT_NAME}/htdocs")
     set(DEBUG "OFF")
 else()
     set(ASSETS_PATH "${PROJECT_SOURCE_DIR}/htdocs")

PKGBUILD

@@ -5,7 +5,7 @@
 
 pkgname=mympd
 _pkgname=myMPD
-pkgver=4.1.1
+pkgver=4.1.2
 pkgrel=1
 pkgdesc="A standalone MPD Web GUI based on YMPD - Default port set to 80"
 arch=('x86_64' 'armv7h' 'aarch64')
@@ -18,10 +18,8 @@ provides=()
 conflicts=()
 replaces=()
 install=contrib/archlinux.install
-source=("https://github.com/jcorporation/${_pkgname}/archive/v${pkgver}.tar.gz"
-        'mympd.install')
-sha256sums=('ec776fa76b2623f27e147abbb0e182d54fb8b80917a35533e58d95ca9f0571d1'
-            'b01671a1153764d96655069f0a9ddf8ab2f7370f60a3789f6f1b4f370474df67')
+source=("https://github.com/jcorporation/${_pkgname}/archive/v${pkgver}.tar.gz")
+sha256sums=('SKIP')
 
 prepare() {
   export java=$(which java 2> /dev/null)
@@ -83,5 +81,6 @@ package() {
   mv "${pkgdir}/etc/mympd/mympd.conf" "${pkgdir}/etc/mympd/mympd.conf.dist"
 
   install -Dm644  "${srcdir}/${_pkgname}-${pkgver}/contrib/mympd.service" "$pkgdir/usr/lib/systemd/system/mympd.service"
+  /usr/share/mympd/crcert.sh
 }
 

contrib/myMPD.spec

@@ -4,13 +4,13 @@
 # (c) 2018 Juergen Mang <[email protected]
 
 Name:           myMPD
-Version:        4.1.1
+Version:        4.1.2
 Release:        0 
 License:        GPL-2.0 
 Group:          Productivity/Multimedia/Sound/Players
 Summary:        Standalone webclient for mpd
 Url:            https://github.com/jcorporation/myMPD
-Source:         https://github.com/jcorporation/myMPD/archive/v4.1.1.zip
+Source:         https://github.com/jcorporation/myMPD/archive/v4.1.2.zip
 BuildRequires:  gcc
 BuildRequires:  cmake
 BuildRequires:  unzip

contrib/uninstall.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+rm -r /etc/mympd
+rm -r /var/lib/mympd
+rm -r /usr/share/mympd
+rm -f /usr/lib/systemd/system/mympd.service
+
+userdel mympd
+groupdel mympd

debian/changelog

@@ -1,4 +1,4 @@
-mympd (4.1.1-1) unstable; urgency=medium
+mympd (4.1.2-1) unstable; urgency=medium
 
   * Initial release 
 

debian/postinst

@@ -4,7 +4,7 @@ echo "Fixing ownership of /var/lib/mympd"
 getent group mympd > /dev/null
 [ "$?" = "2" ] && groupadd -r mympd
 getent passwd mympd > /dev/null
-[ "$?" = "2" ] && useradd -r mympd -g mympd-d /var/lib/mympd -s /usr/sbin/nologin
+[ "$?" = "2" ] && useradd -r mympd -g mympd -d /var/lib/mympd -s /usr/sbin/nologin
 
 chown -R mympd.mympd /var/lib/mympd
 
@@ -32,7 +32,7 @@ then
   echo "Certificates already created"
 else
   echo "Creating certificates"
-  sudo contrib/crcert.sh
+  sudo /usr/share/mympd/crcert.sh
 fi
 
 echo "myMPD installed"

htdocs/sw.js

@@ -1,4 +1,4 @@
-var CACHE = 'myMPD-cache-v4.1.1';
+var CACHE = 'myMPD-cache-v4.1.2';
 var urlsToCache = [
     '/',
     '/player.html',

mkdebian.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 ./mkclean.sh
-tar -czvf ../mympd_4.1.1.orig.tar.gz *
+tar -czvf ../mympd_4.1.2.orig.tar.gz *
 dpkg-buildpackage -rfakeroot

mkrelease.sh

@@ -82,7 +82,7 @@ then
   echo "Certificates already created"
 else
   echo "Creating certificates"
-  sudo contrib/crcert.sh
+  sudo /usr/share/mympd/crcert.sh
 fi
 
 echo "myMPD installed"

src/mympd.c

@@ -276,6 +276,8 @@ int main(int argc, char **argv) {
     mg_set_protocol_http_websocket(nc);
     s_http_server_opts.document_root = SRC_PATH;
     s_http_server_opts.enable_directory_listing = "no";
+
+    printf("Document root: %s\n", SRC_PATH);
 
     printf("Listening on http port %s\n", config.webport);
     if (config.ssl == true)