v2.2-4

- Use asar, avoiding the "/opt" directory
- No longer compresses the examples
- Remove all electron version reference from the asar package
- Add desktop entry

4 files changed, 31 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 688d18552932..5de632897c17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
 pkgbase = texture
 	pkgdesc = WYSIWYG editor and reader for DAR/JATS (XML) scientific content
 	pkgver = 2.2
-	pkgrel = 3
+	pkgrel = 4
 	url = http://substance.io/texture/
 	arch = any
 	license = MIT
 	makedepends = npm
 	makedepends = jq
+	makedepends = asar
 	depends = electron4
 	options = !emptydirs
 	source = texture-v2.2.tar.gz::https://github.com/substance/texture/archive/v2.2.tar.gz
+	source = entry.desktop
 	source = run.sh
 	sha256sums = d39833e54519486647c3fedba9bd067cb4e3500951d72b6a7a4d12cad4ce3b1e
 	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = texture
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ad785ed4fac..ccc9eeee799b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,26 @@
 # Maintainer: Danilo J. S. Bellini <danilo dot bellini at gmail dot com>
 pkgname=('texture')
 pkgver=2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="WYSIWYG editor and reader for DAR/JATS (XML) scientific content"
 arch=('any')
 url='http://substance.io/texture/'
 license=('MIT')
-makedepends=('npm' 'jq')
+makedepends=('npm' 'jq' 'asar')
 depends=('electron4')
 options=(!emptydirs)
 source=(
   "texture-v$pkgver.tar.gz::"`
     `"https://github.com/substance/texture/archive/v$pkgver.tar.gz"
+  "entry.desktop"
   "run.sh"
 )
 sha256sums=('d39833e54519486647c3fedba9bd067cb4e3500951d72b6a7a4d12cad4ce3b1e'
+            'SKIP'
             'SKIP')
 
 build() {
-  electron_dist=/usr/lib/electron4
-  electron_version=$(sed s/v// "$electron_dist"/version)
   cd "$srcdir/$pkgname-$pkgver"
-  sed -ri \
-    's/("electron": ").*(",)/\1'$electron_version'\2/' \
-    package.json
-  sed -ri \
-    -e '/electronVersion/i\    "electronDist": "/usr/lib/electron4",' \
-    app/package.json.in
   npm install --production --cache "$srcdir"/npm-cache
   jq -r '
     .devDependencies
@@ -36,17 +30,22 @@ build() {
       ))
     | "\(.key)@\(.value)"
   ' < package.json | xargs npm install --cache "$srcdir"/npm-cache
+  sed -ri '/electron/d' package.json
+  sed -ri '/electronVersion/d' app/package.json.in
+  sed -ri '/examples\/|electronVersion/d' make.js
   node make app
+  rm -rf app-dist/{*.map,build-resources,package-lock.json}
   find app-dist -name package.json -print0 | xargs -0 sed -i /_where/d
 }
 
 package() {
-  appdistdir="$srcdir/$pkgname-$pkgver/app-dist"
-  mkdir -p "$pkgdir"/opt/texture "$pkgdir"/usr/bin
-  cp -a "$appdistdir"/{node_modules,lib,templates,*.js,*.json,*.html} \
-        "$pkgdir"/opt/texture
-  install -Dm644 "$srcdir/$pkgname-$pkgver"/LICENSE.md \
-                 "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
-  install -Dm755 "$srcdir"/run.sh "$pkgdir"/usr/bin/texture
-  chown -R root:root "$pkgdir"/opt/texture
+  cd "$srcdir/$pkgname-$pkgver"
+  asar pack app-dist dist/texture.asar
+  install -Dm644 dist/texture.asar "$pkgdir"/usr/lib/texture.asar
+  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+  install -Dm644 app/build-resources/icons/512x512.png \
+                 "$pkgdir/usr/share/icons/hicolor/512x512/apps/texture.png"
+  cd "$srcdir"
+  install -Dm755 run.sh "$pkgdir"/usr/bin/texture
+  install -Dm644 entry.desktop "$pkgdir/usr/share/applications/texture.desktop"
 }
diff --git a/entry.desktop b/entry.desktop
new file mode 100644
index 000000000000..434a98079964
--- /dev/null
+++ b/entry.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Texture
+Comment=WYSIWYG editor and reader for DAR/JATS (XML) scientific content
+Comment[pt]=Editor WYSIWYG e leitor de conteúdo científico em DAR/JATS (XML)
+Exec=texture
+Terminal=false
+Type=Application
+Icon=texture
+Categories=Education;Science
diff --git a/run.sh b/run.sh
index 775f7bbb82db..15c552c9d932 100755
--- a/run.sh
+++ b/run.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec electron4 /opt/texture/ "$@"
+exec electron4 /usr/lib/texture.asar "$@"