From 0b354a26904ad89ba051a142f4d698cc9f8f7444 Mon Sep 17 00:00:00 2001
From: jcorporation <mail@jcgames.de>
Date: Sun, 16 Sep 2018 23:22:36 +0200
Subject: [PATCH] Fix: Bump version to 4.1.2 Fix: Archlinux PKGBUILD checksums
 and install script #45 Fix: Debian packaging #54

---
 CMakeLists.txt        | 4 ++--
 PKGBUILD              | 9 ++++-----
 contrib/myMPD.spec    | 4 ++--
 contrib/uninstall.sh  | 8 ++++++++
 debian/changelog      | 2 +-
 debian/postinst       | 4 ++--
 dist/htdocs/sw.min.js | 2 +-
 htdocs/sw.js          | 2 +-
 mkdebian.sh           | 2 +-
 mkrelease.sh          | 2 +-
 src/mympd.c           | 2 ++
 11 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100755 contrib/uninstall.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e528e4..4f5e127 100644
--- a/CMakeLists.txt
+++ b/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")
diff --git a/PKGBUILD b/PKGBUILD
index 22831e3..eab2876 100644
--- a/PKGBUILD
+++ b/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
 }
 
diff --git a/contrib/myMPD.spec b/contrib/myMPD.spec
index 95352e3..c6d2306 100644
--- a/contrib/myMPD.spec
+++ b/contrib/myMPD.spec
@@ -4,13 +4,13 @@
 # (c) 2018 Juergen Mang <mail@jcgames.de
 
 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
diff --git a/contrib/uninstall.sh b/contrib/uninstall.sh
new file mode 100755
index 0000000..e7ca3b9
--- /dev/null
+++ b/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
diff --git a/debian/changelog b/debian/changelog
index 522af58..b9129cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mympd (4.1.1-1) unstable; urgency=medium
+mympd (4.1.2-1) unstable; urgency=medium
 
   * Initial release 
 
diff --git a/debian/postinst b/debian/postinst
index f72775f..8c27229 100755
--- a/debian/postinst
+++ b/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"
diff --git a/dist/htdocs/sw.min.js b/dist/htdocs/sw.min.js
index 10d8e65..45c2403 100644
--- a/dist/htdocs/sw.min.js
+++ b/dist/htdocs/sw.min.js
@@ -10,5 +10,5 @@ function(){function a(a){return function(d){c||(c=!0,a.call(b,d))}}var b=this,c=
 void 0;try{d=a.then}catch(h){this.reject_(h);return}"function"==typeof d?this.settleSameAsThenable_(d,a):this.fulfill_(a)};c.prototype.reject_=function(a){this.settle_(2,a)};c.prototype.fulfill_=function(a){this.settle_(1,a)};c.prototype.settle_=function(a,b){if(0!=this.state_)throw Error("Cannot settle("+a+", "+b+"): Promise already settled in state"+this.state_);this.state_=a;this.result_=b;this.executeOnSettledCallbacks_()};c.prototype.executeOnSettledCallbacks_=function(){if(null!=this.onSettledCallbacks_){for(var a=
 0;a<this.onSettledCallbacks_.length;++a)l.asyncExecute(this.onSettledCallbacks_[a]);this.onSettledCallbacks_=null}};var l=new b;c.prototype.settleSameAsPromise_=function(a){var b=this.createResolveAndReject_();a.callWhenSettled_(b.resolve,b.reject)};c.prototype.settleSameAsThenable_=function(a,b){var c=this.createResolveAndReject_();try{a.call(b,c.resolve,c.reject)}catch(k){c.reject(k)}};c.prototype.then=function(a,b){function d(a,b){return"function"==typeof a?function(b){try{f(a(b))}catch(m){e(m)}}:
 b}var f,e,g=new c(function(a,b){f=a;e=b});this.callWhenSettled_(d(a,f),d(b,e));return g};c.prototype.catch=function(a){return this.then(void 0,a)};c.prototype.callWhenSettled_=function(a,b){function c(){switch(d.state_){case 1:a(d.result_);break;case 2:b(d.result_);break;default:throw Error("Unexpected state: "+d.state_);}}var d=this;null==this.onSettledCallbacks_?l.asyncExecute(c):this.onSettledCallbacks_.push(c)};c.resolve=f;c.reject=function(a){return new c(function(b,c){c(a)})};c.race=function(a){return new c(function(b,
-c){for(var d=$jscomp.makeIterator(a),e=d.next();!e.done;e=d.next())f(e.value).callWhenSettled_(b,c)})};c.all=function(a){var b=$jscomp.makeIterator(a),d=b.next();return d.done?f([]):new c(function(a,c){function e(b){return function(c){g[b]=c;h--;0==h&&a(g)}}var g=[],h=0;do g.push(void 0),h++,f(d.value).callWhenSettled_(e(g.length-1),c),d=b.next();while(!d.done)})};return c},"es6","es3");var CACHE="myMPD-cache-v4.1.1",urlsToCache="/ /player.html /css/bootstrap.min.css /css/mympd.min.css /js/bootstrap-native-v4.min.js /js/mympd.min.js /js/player.min.js /assets/appicon-167.png /assets/appicon-192.png /assets/appicon-512.png /assets/coverimage-httpstream.png /assets/coverimage-notavailable.png /assets/favicon.ico /assets/MaterialIcons-Regular.eot /assets/MaterialIcons-Regular.ttf /assets/MaterialIcons-Regular.woff /assets/MaterialIcons-Regular.woff2".split(" ");
+c){for(var d=$jscomp.makeIterator(a),e=d.next();!e.done;e=d.next())f(e.value).callWhenSettled_(b,c)})};c.all=function(a){var b=$jscomp.makeIterator(a),d=b.next();return d.done?f([]):new c(function(a,c){function e(b){return function(c){g[b]=c;h--;0==h&&a(g)}}var g=[],h=0;do g.push(void 0),h++,f(d.value).callWhenSettled_(e(g.length-1),c),d=b.next();while(!d.done)})};return c},"es6","es3");var CACHE="myMPD-cache-v4.1.2",urlsToCache="/ /player.html /css/bootstrap.min.css /css/mympd.min.css /js/bootstrap-native-v4.min.js /js/mympd.min.js /js/player.min.js /assets/appicon-167.png /assets/appicon-192.png /assets/appicon-512.png /assets/coverimage-httpstream.png /assets/coverimage-notavailable.png /assets/favicon.ico /assets/MaterialIcons-Regular.eot /assets/MaterialIcons-Regular.ttf /assets/MaterialIcons-Regular.woff /assets/MaterialIcons-Regular.woff2".split(" ");
 self.addEventListener("install",function(a){a.waitUntil(caches.open(CACHE).then(function(a){return a.addAll(urlsToCache)}))});self.addEventListener("fetch",function(a){a.respondWith(caches.match(a.request).then(function(b){return b?b:fetch(a.request)}))});self.addEventListener("activate",function(a){a.waitUntil(caches.keys().then(function(a){return Promise.all(a.map(function(a){if(a!=CACHE)return caches.delete(a)}))}))});
diff --git a/htdocs/sw.js b/htdocs/sw.js
index a73c085..e88d5f4 100644
--- a/htdocs/sw.js
+++ b/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',
diff --git a/mkdebian.sh b/mkdebian.sh
index f3ce192..f6bf51d 100755
--- a/mkdebian.sh
+++ b/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
diff --git a/mkrelease.sh b/mkrelease.sh
index f7ee686..402c5ad 100755
--- a/mkrelease.sh
+++ b/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"
diff --git a/src/mympd.c b/src/mympd.c
index d5312d9..9d7b558 100644
--- a/src/mympd.c
+++ b/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)