fixed bug

7 files changed, 44 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3436fee8946..03c7c0d02c83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,7 @@ pkgbase = imagine-git
 	pkgver = 0.5.0.r0.g7bea16d
 	pkgrel = 1.1
 	url = https://github.com/meowtec/Imagine
-	install = imagine.install
+	install = imagine-git.install
 	arch = x86_64
 	license = MIT
 	makedepends = git
@@ -12,14 +12,15 @@ pkgbase = imagine-git
 	depends = imagemagick
 	provides = imagine-git
 	conflicts = imagine-git
-	source = imagine::git+https://github.com/meowtec/Imagine.git#tag=v0.5.0
-	source = imagine.sh
-	source = imagine.desktop
-	source = imagine.install
+	options = !strip
+	source = imagine-git::git+https://github.com/meowtec/Imagine.git#tag=v0.5.0
+	source = imagine-git.sh
+	source = imagine-git.desktop
+	source = imagine-git.install
 	md5sums = SKIP
-	md5sums = e7577f322638f548ea42e7e1c9cd77d8
-	md5sums = 7f80869e29fd5af22e4c303f9a10975f
-	md5sums = 671bee3aec8f7e0a0556ee8d336c604d
+	md5sums = d59bb8174b24651acc0f5d6c68796eaa
+	md5sums = 6878e7b5d0f0d25da436023eca55beca
+	md5sums = a2123b329fe19aa386ffd3af1483594c
 
 pkgname = imagine-git
 
diff --git a/.gitignore b/.gitignore
index 26219acd05d7..eaf589f8d1d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 *
 
-!imagine.desktop
-!imagine.install
-!imagine.sh
+!imagine-git.desktop
+!imagine-git.install
+!imagine-git.sh
 !PKGBUILD
 !.SRCINFO
 !.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 30f33ff7b7f9..9ba98afe1fab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,6 @@
 # Maintainer: davedatum <ask at davedatum dot com>
 
 pkgname=imagine-git
-_pkgname=imagine
 pkgver=0.5.0.r0.g7bea16d
 pkgrel=1.1
 pkgdesc="PNG/JPEG optimization app"
@@ -12,37 +11,41 @@ depends=("electron2" "imagemagick")
 makedepends=("git" "npm")
 provides=("${pkgname}")
 conflicts=("${pkgname}")
-install=${_pkgname}.install
-source=("${_pkgname}::git+$url.git#tag=v0.5.0"
-		"${_pkgname}.sh"
-		"${_pkgname}.desktop"
-		"${_pkgname}.install")
+install=${pkgname}.install
+options=(!strip)
+source=("${pkgname}::git+$url.git#tag=v0.5.0"
+		"${pkgname}.sh"
+		"${pkgname}.desktop"
+		"${pkgname}.install")
 md5sums=('SKIP'
-         'e7577f322638f548ea42e7e1c9cd77d8'
-         '7f80869e29fd5af22e4c303f9a10975f'
-         '671bee3aec8f7e0a0556ee8d336c604d')
+         'd59bb8174b24651acc0f5d6c68796eaa'
+         '6878e7b5d0f0d25da436023eca55beca'
+         'a2123b329fe19aa386ffd3af1483594c')
 
 pkgver() {
-  cd "${_pkgname}"
+  cd "${pkgname}"
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-	cd "${srcdir}/${_pkgname}" 
+	cd "${srcdir}/${pkgname}" 
 	npm install && npm run pack
 }
 
 package() {
-	install -Dm755 "${srcdir}/${_pkgname}/dist/linux-unpacked/resources/app.asar" "${pkgdir}/opt/${_pkgname}/app.asar"
-	install -Dm644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-	install -Dm644 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
+  install -d "${pkgdir}/opt/${pkgname}"
+  cp -a "${srcdir}/${pkgname}/dist/linux-unpacked/." "${pkgdir}/opt/${pkgname}"
+  chmod 755 "${pkgdir}/opt/${pkgname}"
 
-	install -Dm644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+	install -Dm644 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
 
-  	for _size in "192x192" "128x128" "96x96" "64x64" "48x48" "32x32" "24x24" "22x22" "20x20" "16x16" "8x8"
-  	do
-    	install -dm755 "${pkgdir}/usr/share/icons/hicolor/$_size/apps"
-    	convert "${srcdir}/${_pkgname}/build/icon.png" \
-    	-resize "$_size" "${pkgdir}/usr/share/icons/hicolor/$_size/apps/${_pkgname}.png"
-  	done
+	install -Dm644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  for _size in "192x192" "128x128" "96x96" "64x64" "48x48" "32x32" "24x24" "22x22" "20x20" "16x16" "8x8"
+  do
+    install -dm755 "${pkgdir}/usr/share/icons/hicolor/$_size/apps"
+    convert "${srcdir}/${pkgname}/build/icon.png" \
+    -resize "$_size" "${pkgdir}/usr/share/icons/hicolor/$_size/apps/${pkgname}.png"
+  done
 }
\ No newline at end of file
diff --git a/imagine.desktop b/imagine-git.desktop
index b5e26fad7bb9..c53f67ea5b2f 100644
--- a/imagine.desktop
+++ b/imagine-git.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Imagine
+Name=imagine-git
 Comment=PNG/JPEG optimization app
-Exec=/usr/bin/imagine
+Exec=/usr/bin/imagine-git
 Terminal=false
 Type=Application
 Icon=imagine
-StartupWMClass=Imagine
+StartupWMClass=imagine-git
 Categories=Graphics;
\ No newline at end of file
diff --git a/imagine.install b/imagine-git.install
index 7d3b993137dd..17ae7373b621 100644
--- a/imagine.install
+++ b/imagine-git.install
@@ -1,5 +1,5 @@
 post_install() {
-		chmod +x /usr/bin/imagine
+		chmod +x /usr/bin/imagine-git
 }
 
 post_upgrade() {
diff --git a/imagine-git.sh b/imagine-git.sh
new file mode 100755
index 000000000000..25083d0539e8
--- /dev/null
+++ b/imagine-git.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Launch application
+exec /opt/imagine-git/imagine "$@"
\ No newline at end of file
diff --git a/imagine.sh b/imagine.sh
deleted file mode 100755
index db014b31dd85..000000000000
--- a/imagine.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Launch application
-exec electron2 /opt/imagine/app.asar "$@"
\ No newline at end of file