Get packaging working, tag for release

3 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dde866ad3a9f..274e2ceccbf8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ezra-project-git
 	pkgdesc = a bible study software focussing on topical study based on keywords/tags
-	pkgver = 0.7.1.r78.ga4116c6
-	pkgrel = 0
+	pkgver = 0.7.1.r84.g435b258
+	pkgrel = 1
 	url = https://github.com/tobias-klein/ezra-project
 	arch = x86_64
 	license = GPL3
@@ -14,7 +14,7 @@ pkgbase = ezra-project-git
 	source = ezra-project.sh
 	source = ezra-project.desktop
 	sha256sums = SKIP
-	sha256sums = 64a090df98701e76e973f44692f4c4a33e9b78557f59b4b7e99beb6f407836d9
+	sha256sums = 0a36167bce248b6082045163cf60b143d02ca1e447a791cf0c88e960a7fdc618
 	sha256sums = f89adcdecca5b0684679a4c4060a7e0398b5d332b2377e0fb0e115969d94e116
 
 pkgname = ezra-project-git
diff --git a/PKGBUILD b/PKGBUILD
index 4f8256635921..eea9c5d1c12b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # https://wiki.archlinux.org/index.php/Electron_package_guidelines
 
 pkgname=ezra-project-git
-pkgver=0.7.1.r78.ga4116c6
+pkgver=0.7.1.r84.g435b258
 _branch='master'
-pkgrel=0
+pkgrel=1
 pkgdesc="a bible study software focussing on topical study based on keywords/tags"
 arch=('x86_64')
 url="https://github.com/tobias-klein/ezra-project"
@@ -16,8 +16,9 @@ source=("git://github.com/tobias-klein/${pkgname%-git}.git#branch=$_branch"
         'ezra-project.sh'
         'ezra-project.desktop')
 sha256sums=('SKIP'
-            '64a090df98701e76e973f44692f4c4a33e9b78557f59b4b7e99beb6f407836d9'
+            '0a36167bce248b6082045163cf60b143d02ca1e447a791cf0c88e960a7fdc618'
             'f89adcdecca5b0684679a4c4060a7e0398b5d332b2377e0fb0e115969d94e116')
+_electron="$(electron --version | sed 's/^v//')"
 
 pkgver() {
     cd "$srcdir/${pkgname%-git}"
@@ -26,23 +27,22 @@ pkgver() {
 
 prepare() {
     cd "$srcdir/${pkgname%-git}"
-    local version="$(electron --version | sed 's/^v//')"
     npm uninstall --no-audit -D electron
-    npm install --no-audit electron@"$version"
+    npm install --no-audit electron@"$_electron"
 }
 
 build() {
     cd "$srcdir/${pkgname%-git}"
-    npm run rebuild-linux
+    # npm run rebuild-linux
+    $(npm bin)/electron-rebuild -f -w node-sword-interface -v $_electron
 }
 
 package() {
     cd "$srcdir/${pkgname%-git}"
-    install -Dm755 "$srcdir/${pkgname%-git}.sh" "$pkgdir/usr/bin/${pkgname%-git}"
     install -Dm644 "$srcdir/${pkgname%-git}.desktop" "$pkgdir/usr/share/applications/${pkgname%-git}.desktop"
-
-    cd release/ezra-project-linux-x64/resources
-    install -Dm644 electron.asar "$pkgdir/usr/lib/${pkgname%-git}/app.asar"
-    cp -a app "$pkgdir/usr/lib/${pkgname%-git}/"
+    install -Dm755 "$srcdir/${pkgname%-git}.sh" "$pkgdir/usr/bin/${pkgname%-git}"
+    $(npm bin)/electron-packager . ${pkgname%-git} --overwrite --asar --platform=linux --arch=x64 --prune=true --out=release --electron-version=$_electron
+    rm release/ezra-project-linux-x64/${pkgname%-git}
+    mkdir "$pkgdir/usr/lib/"
+    cp -a release/ezra-project-linux-x64 "$pkgdir/usr/lib/${pkgname%-git}"
 }
-
diff --git a/ezra-project.sh b/ezra-project.sh
index 0eb41d707d7e..68bbd4da8b70 100755
--- a/ezra-project.sh
+++ b/ezra-project.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-exec electron /usr/lib/ezra-project/app.asar "$@"
+exec electron /usr/lib/ezra-project/resources/app.asar "$@"