Fix: simplified packaging

jcorporation · Sep 20, 2018 · 4961daa · 4961daa
1 parent 9272b69
commit 4961daa
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 69 deletions.
diff --git a/PKGBUILD b/PKGBUILD
@@ -1,7 +1,6 @@
-# Maintainer: K. Loz <cultofrobots [at] protonmail [dot] com>
-# Based on jcorporation's myMPD mkrelease.sh 
+# Maintainer: Juergen Mang <mail [at] jcgames [dot] de>
 # Website: https://github.com/jcorporation/myMPD
-# PKGBUILD Based on mympd-archphile by Mike Andonov <info [at] archphile [dot] org>
+# PKGBUILD Based on https://github.com/CultofRobots/archphile-custom/tree/master/mympd
 
 pkgname=mympd
 _pkgname=myMPD
@@ -12,7 +11,7 @@ arch=('x86_64' 'armv7h' 'aarch64')
 url="http://github.org/jcorporation/myMPD"
 license=('GPL')
 depends=('libmpdclient' 'openssl')
-makedepends=('cmake' 'git')
+makedepends=('cmake')
 optdepends=()
 provides=()
 conflicts=()
@@ -21,49 +20,6 @@ install=contrib/archlinux.install
 source=("https://github.com/jcorporation/${_pkgname}/archive/v${pkgver}.tar.gz")
 sha256sums=('SKIP')
 
-prepare() {
-  export java=$(which java 2> /dev/null)
-
-  if [ -f ${srcdir}/${_pkgname}-${pkgver}/dist/buildtools/closure-compiler.jar ] && [ "$java" != "$NULL" ]
-  then
-    echo "Minifying javascript"
-    [ ${srcdir}/${_pkgname}-${pkgver}/htdocs/js/player.js -nt ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/js/player.min.js ] && \
-      java -jar ${srcdir}/${_pkgname}-${pkgver}/dist/buildtools/closure-compiler.jar ${srcdir}/${_pkgname}-${pkgver}/htdocs/js/player.js > ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/js/player.min.js
-    [ ${srcdir}/${_pkgname}-${pkgver}/htdocs/js/mympd.js -nt  ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/js/mympd.min.js ] && \
-      java -jar ${srcdir}/${_pkgname}-${pkgver}/dist/buildtools/closure-compiler.jar ${srcdir}/${_pkgname}-${pkgver}/htdocs/js/mympd.js > ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/js/mympd.min.js
-    [ ${srcdir}/${_pkgname}-${pkgver}/htdocs/sw.js -nt ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/sw.min.js ] && \
-      java -jar ${srcdir}/${_pkgname}-${pkgver}/dist/buildtools/closure-compiler.jar ${srcdir}/${_pkgname}-${pkgver}/htdocs/sw.js > ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/sw.min.js
-  else
-    echo "${srcdir}/${_pkgname}-${pkgver}/dist/buildtools/closure-compiler.jar not found, using non-minified files"
-    [ ${srcdir}/${_pkgname}-${pkgver}/htdocs/js/player.js -nt ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/js/player.min.js ] && \
-      cp ${srcdir}/${_pkgname}-${pkgver}/htdocs/js/player.js ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/js/player.min.js
-    [ ${srcdir}/${_pkgname}-${pkgver}/htdocs/js/mympd.js -nt  ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/js/mympd.min.js ] && \
-      cp ${srcdir}/${_pkgname}-${pkgver}/htdocs/js/mympd.js  ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/js/mympd.min.js
-    [ ${srcdir}/${_pkgname}-${pkgver}/htdocs/sw.js -nt ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/sw.min.js ] && \
-      cp ${srcdir}/${_pkgname}-${pkgver}/htdocs/sw.js ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/sw.min.js    
-  fi
-
-  if [ -f ${srcdir}/${_pkgname}-${pkgver}/dist/buildtools/closure-stylesheets.jar ] && [ "$java" != "$NULL" ]
-  then
-    echo "Minifying stylesheets"
-    [ ${srcdir}/${_pkgname}-${pkgver}/htdocs/css/mympd.css -nt ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/css/mympd.min.css ] && \
-      java -jar ${srcdir}/${_pkgname}-${pkgver}/dist/buildtools/closure-stylesheets.jar --allow-unrecognized-properties ${srcdir}/${_pkgname}-${pkgver}/htdocs/css/mympd.css > ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/css/mympd.min.css
-  else
-    echo "${srcdir}/${_pkgname}-${pkgver}/dist/buildtools/closure-stylesheets.jar not found, using non-minified files"
-    [ ${srcdir}/${_pkgname}-${pkgver}/htdocs/css/mympd.css -nt ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/css/mympd.min.css ] && \
-      cp ${srcdir}/${_pkgname}-${pkgver}/htdocs/css/mympd.css ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/css/mympd.min.css    
-  fi
-
-  echo "Replacing javascript and stylesheets with minified files"
-  sed -e 's/mympd\.css/mympd\.min\.css/' -e 's/mympd\.js/mympd\.min\.js/' ${srcdir}/${_pkgname}-${pkgver}/htdocs/index.html > ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/index.html
-  sed -e 's/mympd\.css/mympd\.min\.css/' -e 's/player\.js/player\.min\.js/' ${srcdir}/${_pkgname}-${pkgver}/htdocs/player.html > ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/player.html
-  sed -i -e 's/mympd\.css/mympd\.min\.css/' -e 's/mympd\.js/mympd\.min\.js/' -e 's/player\.js/player\.min\.js/' ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/sw.min.js
-  sed -i -e 's/\/sw\.js/\/sw\.min\.js/' ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/js/mympd.min.js
-  echo "Minifying html"
-  perl -i -pe 's/^\s*//gm; s/\s*$//gm' ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/index.html
-  perl -i -pe 's/^\s*//gm; s/\s*$//gm' ${srcdir}/${_pkgname}-${pkgver}/dist/htdocs/player.html
-}
-
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
@@ -80,4 +36,3 @@ package() {
   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
@@ -1,7 +1,7 @@
 #
 # spec file for package myMPD
 #
-# (c) 2018 Juergen Mang <mail@jcgames.de
+# (c) 2018 Juergen Mang <mail@jcgames.de>
 
 Name:           myMPD
 Version:        4.2.1
@@ -102,5 +102,5 @@ fi
 /var/lib/mympd
 
 %changelog
-* Wed Sep 17 2018 Juergen Mang <mail@jcgames.de> - master
+* Fri Sep 21 2018 Juergen Mang <mail@jcgames.de> - master
 - Version from master
diff --git a/dist/htdocs/js/mympd.min.js b/dist/htdocs/js/mympd.min.js
diff --git a/htdocs/index.html b/htdocs/index.html
@@ -10,7 +10,7 @@
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
   <meta name="theme-color" content="#343a40">
   <link href="/css/bootstrap.min.css" rel="stylesheet">
-  <link href="/css/mympd.css" rel="stylesheet">
+  <link href="/css/mympd.min.css" rel="stylesheet">
   <link href="/assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon">  
   <link rel="manifest" href="/mympd.webmanifest">
   <link rel="apple-touch-icon" href="/assets/appicon-167.png">
@@ -833,6 +833,6 @@ <h1></h1>
   </div>
 
   <script src="/js/bootstrap-native-v4.min.js"></script>
-  <script src="/js/mympd.js"></script>
+  <script src="/js/mympd.min.js"></script>
  </body>
 </html>
diff --git a/htdocs/js/mympd.js b/htdocs/js/mympd.js
@@ -550,7 +550,7 @@ function appInit() {
 
     if ('serviceWorker' in navigator && document.URL.substring(0, 5) == 'https') {
         window.addEventListener('load', function() {
-            navigator.serviceWorker.register('/sw.js', {scope: '/'}).then(function(registration) {
+            navigator.serviceWorker.register('/sw.min.js', {scope: '/'}).then(function(registration) {
                 // Registration was successful
                 console.log('ServiceWorker registration successful with scope: ', registration.scope);
                 registration.update();

diff --git a/htdocs/player.html b/htdocs/player.html
@@ -7,7 +7,7 @@
   <meta name="author" content="mail@jcgames.de">
   <title>myMPD: Local Player</title>
   <link href="css/bootstrap.min.css" rel="stylesheet">
-  <link href="css/mympd.css" rel="stylesheet">
+  <link href="css/mympd.min.css" rel="stylesheet">
   <link href="assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon">
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
@@ -29,6 +29,6 @@
       </div>
     </div>
   </main>
-  <script type="text/javascript" src="js/player.js"></script>  
+  <script type="text/javascript" src="js/player.min.js"></script>  
 </body>
 </html>
diff --git a/mkclean.sh b/mkclean.sh
@@ -3,8 +3,16 @@ rm -rf release
 rm -rf debug
 rm -rf debian/tmp
 rm -f debian/files
-rm -f htdocs/js/bootstrap-native-v4.min.js
-rm -f htdocs/css/bootstrap.min.css
+
 rm -f htdocs/library
 rm -f htdocs/pics
+
+rm -f htdocs/sw.min.js
+rm -f htdocs/js/mympd.min.js
+rm -f htdocs/js/player.min.js
+rm -f htdocs/js/bootstrap-native-v4.min.js
+
+rm -f htdocs/css/mympd.min.css
+rm -f htdocs/css/bootstrap.min.css
+
 find ./ -name \*~ -delete
diff --git a/mkdebug.sh b/mkdebug.sh
@@ -1,7 +1,11 @@
 #/bin/sh
+[ -e $PWD/htdocs/sw.min.js ] || ln -s $PWD/htdocs/sw.js $PWD/htdocs/sw.min.js
+[ -e $PWD/htdocs/js/mympd.min.js ] || ln -s $PWD/htdocs/js/mympd.js $PWD/htdocs/js/mympd.min.js
+[ -e $PWD/htdocs/js/player.min.js ] || ln -s $PWD/htdocs/js/player.js $PWD/htdocs/js/player.min.js
+[ -e $PWD/htdocs/js/bootstrap-native-v4.min.js ] || ln -s $PWD/dist/htdocs/js/bootstrap-native-v4.js $PWD/htdocs/js/bootstrap-native-v4.min.js
 
-cp dist/htdocs/js/bootstrap-native-v4.js htdocs/js/bootstrap-native-v4.min.js
-cp dist/htdocs/css/bootstrap.min.css htdocs/css/
+[ -e $PWD/htdocs/css/mympd.min.css ] || ln -s $PWD/htdocs/css/mympd.css $PWD/htdocs/css/mympd.min.css
+[ -e $PWD/htdocs/css/bootstrap.min.css ] || ln -s $PWD/dist/htdocs/css/bootstrap.min.css $PWD/htdocs/css/bootstrap.min.css
 
 echo "Trying to link musicdir to library"
 if [ -f /etc/mpd.conf ]
@@ -13,7 +17,7 @@ else
 fi
 
 echo "Linking pics directory"
-[ -e htdocs/pics ] || ln -s /var/lib/mympd/pics htdocs/
+[ -e $PWD/htdocs/pics ] || ln -s /var/lib/mympd/pics htdocs/
 
 [ -d debug ] || mkdir debug
 cd debug

diff --git a/mkrelease.sh b/mkrelease.sh
@@ -32,14 +32,11 @@ else
     cp htdocs/css/mympd.css dist/htdocs/css/mympd.min.css    
 fi
 
-echo "Replacing javascript and stylesheets with minified files"
-sed -e 's/mympd\.css/mympd\.min\.css/' -e 's/mympd\.js/mympd\.min\.js/' htdocs/index.html > dist/htdocs/index.html
-sed -e 's/mympd\.css/mympd\.min\.css/' -e 's/player\.js/player\.min\.js/' htdocs/player.html > dist/htdocs/player.html
-sed -i -e 's/mympd\.css/mympd\.min\.css/' -e 's/mympd\.js/mympd\.min\.js/' -e 's/player\.js/player\.min\.js/' dist/htdocs/sw.min.js
-sed -i -e 's/\/sw\.js/\/sw\.min\.js/' dist/htdocs/js/mympd.min.js
 echo "Minifying html"
-perl -i -pe 's/^\s*//gm; s/\s*$//gm' dist/htdocs/index.html
-perl -i -pe 's/^\s*//gm; s/\s*$//gm' dist/htdocs/player.html
+[ htdocs/index.html -nt dist/htdocs/index.html ] && \
+  perl -pe 's/^\s*//gm; s/\s*$//gm' htdocs/index.html > dist/htdocs/index.html
+[ htdocs/player.html -nt dist/htdocs/player.html ] && \
+  perl -pe 's/^\s*//gm; s/\s*$//gm' htdocs/player.html > dist/htdocs/player.html
 
 echo "Compiling and installing mympd"
 [ -d release ] || mkdir release