fixes

4 files changed, 31 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb8f4d1b2105..c3cf08204917 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tidal-music-linux-git
 	pkgdesc = An electron based wrapper around the Tidal web player for Linux
-	pkgver = 1.0
+	pkgver = 2.0
 	pkgrel = 1
 	url = https://github.com/Bunkerbewohner/tidal-music-linux
 	arch = x86_64
@@ -14,11 +14,9 @@ pkgbase = tidal-music-linux-git
 	source = git+https://github.com/Bunkerbewohner/tidal-music-linux.git
 	source = tidal-music-linux.desktop
 	source = tidal
-	source = pepperflash-path.patch
 	sha256sums = SKIP
-	sha256sums = e19e840451f261f3e074da6633be787ebcbf5091b98f96d114141d2b602422fc
+	sha256sums = ca8c35585f0f67acf5a311c8127d2f77b022d419ced26df123349ad194557a72
 	sha256sums = 5cf0a00a9eb28019a6126491ddfc4b5455bcd44d43be05f81544d438dface390
-	sha256sums = b4e00a68ffa44ed84d76d3731ad09ded4120d464e6ad286de20df572c92f7147
 
 pkgname = tidal-music-linux-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 2c039a8bd232..00f54e2d4662 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=tidal-music-linux-git
 _pkgname=tidal-music-linux
-pkgver=1.0
+pkgver=2.0
 pkgrel=1
 pkgdesc='An electron based wrapper around the Tidal web player for Linux'
 arch=('x86_64')
@@ -12,48 +12,41 @@ license=('MIT')
 depends=('pepper-flash' 'nodejs' 'git' 'npm' 'electron')
 provides=("${_pkgname}")
 source=(
-	'git+https://github.com/Bunkerbewohner/tidal-music-linux.git'
-	"${_pkgname}.desktop"
-	'tidal'
-	'pepperflash-path.patch'
+  'git+https://github.com/Bunkerbewohner/tidal-music-linux.git'
+  "${_pkgname}.desktop"
+  'tidal'
 )
 sha256sums=(
-	'SKIP'
-	'e19e840451f261f3e074da6633be787ebcbf5091b98f96d114141d2b602422fc'
-	'5cf0a00a9eb28019a6126491ddfc4b5455bcd44d43be05f81544d438dface390'
-	'b4e00a68ffa44ed84d76d3731ad09ded4120d464e6ad286de20df572c92f7147'
+  'SKIP'
+  'ca8c35585f0f67acf5a311c8127d2f77b022d419ced26df123349ad194557a72'
+  '5cf0a00a9eb28019a6126491ddfc4b5455bcd44d43be05f81544d438dface390'
 )
 
-prepare() {
-	pushd "${srcdir}/${_pkgname}"
-	patch -p1 < "${srcdir}/pepperflash-path.patch"
-	popd
-}
-
 build() {
-	pushd "${srcdir}/${_pkgname}"
-	npm install
-	popd
+  pushd "${srcdir}/${_pkgname}"
+  npm install --production
+  popd
 }
 
 package() {
-	# license
-	mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
-	mv "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}"
+  # license
+  mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
+  mv "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}"
 
-	# source
-	mkdir -p "${pkgdir}/usr/share/${pkgname}"
-	cp -v "${srcdir}/${_pkgname}/icon.png" "${pkgdir}/usr/share/${pkgname}"
-	cp -v "${srcdir}/${_pkgname}/main.js" "${pkgdir}/usr/share/${pkgname}"
-	cp -v "${srcdir}/${_pkgname}/index.html" "${pkgdir}/usr/share/${pkgname}"
-	cp -rv "${srcdir}/${_pkgname}/node_modules" "${pkgdir}/usr/share/${pkgname}"
-	cp -v "${srcdir}/${_pkgname}/preload.js" "${pkgdir}/usr/share/${pkgname}"
-	cp -v "${srcdir}/${_pkgname}/style.css" "${pkgdir}/usr/share/${pkgname}"
+  # source
+  mkdir -p "${pkgdir}/usr/share/${pkgname}"
+  cp -v "${srcdir}/${_pkgname}/icon.png" "${pkgdir}/usr/share/${pkgname}"
+  cp -v "${srcdir}/${_pkgname}/main.js" "${pkgdir}/usr/share/${pkgname}"
+  cp -v "${srcdir}/${_pkgname}/index.html" "${pkgdir}/usr/share/${pkgname}"
+  cp -rv "${srcdir}/${_pkgname}/node_modules" "${pkgdir}/usr/share/${pkgname}"
+  cp -v "${srcdir}/${_pkgname}/preload.js" "${pkgdir}/usr/share/${pkgname}"
+  cp -v "${srcdir}/${_pkgname}/style.css" "${pkgdir}/usr/share/${pkgname}"
+  cp -v "${srcdir}/${_pkgname}/pepper-paths.json" "${pkgdir}/usr/share/${pkgname}"
 
-	# bin
-	mkdir -p "${pkgdir}/usr/bin"
-	install -D "tidal" "${pkgdir}/usr/bin/tidal"
+  # bin
+  mkdir -p "${pkgdir}/usr/bin"
+  install -D "tidal" "${pkgdir}/usr/bin/tidal"
 
-	# .desktop
-	install -D "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+  # .desktop
+  install -D "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
 }
diff --git a/pepperflash-path.patch b/pepperflash-path.patch
deleted file mode 100644
index dd64a5acec66..000000000000
--- a/pepperflash-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- old/main.js	2018-07-30 16:14:18.857140051 +0300
-+++ new/main.js	2018-07-30 16:14:33.410393524 +0300
-@@ -10,7 +10,7 @@
- var mainWindow = null;
-
- // TODO: Determine path to Pepper flash plugin, rather than hardcoding it
--var pepperFlashPluginPath = '/usr/lib/adobe-flashplugin/libpepflashplayer.so'
-+var pepperFlashPluginPath = '/usr/lib/PepperFlash/libpepflashplayer.so'
- app.commandLine.appendSwitch('ppapi-flash-path', pepperFlashPluginPath);
-
- // Quit when all windows are closed.
diff --git a/tidal-music-linux.desktop b/tidal-music-linux.desktop
index ef3d6af70f31..5a00725b6cd3 100644
--- a/tidal-music-linux.desktop
+++ b/tidal-music-linux.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Name=Tidal
 GenericName=Music Player
-Icon=/usr/share/tidal-music-linux-git/resources/app/icon.png
-Exec=electron /usr/share/tidal-music-linux-git/main.js
+Icon=/usr/share/tidal-music-linux-git/icon.png
+Exec=/usr/bin/tidal
 Terminal=false
 Categories=Audio;Music;Player;AudioVideo;