Cleanup packaging

4 files changed, 15 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80b71731b43b..5658e91f825d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ezra-project-git
 	pkgdesc = Bible study software focussing on topical study based on keywords/tags
 	pkgver = 0.11.1.r93.g93f5777
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/tobias-klein/ezra-project
 	arch = x86_64
 	license = GPL3
@@ -18,8 +18,6 @@ pkgbase = ezra-project-git
 	depends = nodejs
 	depends = nodejs-addon-api
 	depends = nodejs-sword-interface
-	depends = sqlite
-	depends = sword
 	provides = ezra-project
 	conflicts = ezra-project
 	source = git+https://github.com/tobias-klein/ezra-project.git
diff --git a/.gitignore b/.gitignore
index bda7f17d60d1..5687b41a027e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@
 !./.SRCINFO
 !./.gitignore
 !./PKGBUILD
-!./ezra-project.desktop
 !./ezra-project.sh
diff --git a/PKGBUILD b/PKGBUILD
index fff67d911ab9..3b07adc07429 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ezra-project-git
 pkgver=0.11.1.r93.g93f5777
-pkgrel=3
+pkgrel=4
 pkgdesc='Bible study software focussing on topical study based on keywords/tags'
 arch=('x86_64')
 url="https://github.com/tobias-klein/${pkgname%-git}"
@@ -11,9 +11,7 @@ depends=('electron'
          'icu'
          'nodejs'
          'nodejs-addon-api'
-         'nodejs-sword-interface'
-         'sqlite'
-         'sword')
+         'nodejs-sword-interface')
 makedepends=('gendesk'
              'git'
              'jq'
@@ -23,12 +21,11 @@ makedepends=('gendesk'
              'nodejs-pug-cli'
              'npm')
 provides=("${pkgname%-git}")
-conflicts=($provides)
+conflicts=(${provides[@]})
 source=("git+$url.git"
         'ezra-project.sh')
 sha256sums=('SKIP'
             '0a36167bce248b6082045163cf60b143d02ca1e447a791cf0c88e960a7fdc618')
-_electron="$(electron --version | sed 's/^v//')"
 
 pkgver() {
     cd "${pkgname%-git}"
@@ -37,27 +34,30 @@ pkgver() {
 
 prepare() {
     cd "${pkgname%-git}"
-    jq 'del(.scripts[], .dependencies["node-addon-api", "node-sword-interface"], .devDependencies["electron", "node-gyp", "pug-cli"])' package.json |
+    jq 'del(.dependencies["node-addon-api", "node-sword-interface"], .devDependencies["electron", "electron-osx-sign", "node-abi", "node-gyp", "pug-cli", "sequelize-cli"])' package.json |
         sponge package.json
     gendesk -f -n --pkgname "${pkgname%-git}" --pkgdesc "${pkgname%-git}" --name "Ezra Project"
 }
 
 build() {
     cd "${pkgname%-git}"
-    npm install --cache "$srcdir/npm-cache"
-    pug --client --no-debug --pretty -n verseListTemplate templates/verse_list.pug
-    pug --client --no-debug --pretty -n tagListTemplate templates/tag_list.pug
-    "$(npm bin)"/electron-rebuild --version="$_electron"
+    local _electron="$(electron --version | sed 's/^v//')"
+    npm install --cache "$srcdir/npm-cache" --no-audit --no-fund
+    npx electron-rebuild --version="$_electron"
     node-prune node_modules
     "$(npm bin)"/electron-packager ./ ${pkgname%-git} --electron-version="$_electron"
     ./build_scripts/purge_build_artifacts.sh
-    "$(npm bin)"/electron-packager ./ ${pkgname%-git} --electron-version="$_electron" --overwrite --asar --platform=linux --arch=x64 --prune=true
+    npx electron-packager ./ "${pkgname%-git}" \
+        --electron-version="$_electron" \
+        --asar \
+        --platform=linux \
+        --arch=x64
 }
 
 package() {
     cd "${pkgname%-git}"
+    install -Dm755 "../${pkgname%-git}.sh" "$pkgdir/usr/bin/${pkgname%-git}"
     install -Dm644 -t "$pkgdir/usr/share/applications/" "${pkgname%-git}.desktop"
-    install -Dm755 "$srcdir/${pkgname%-git}.sh" "$pkgdir/usr/bin/${pkgname%-git}"
-    install -Dm644 -t "$pkgdir/usr/lib/${pkgname%-git}/resources/" ${pkgname%-git}-linux-x64/resources/app.asar
+    install -Dm644 -t "$pkgdir/usr/lib/${pkgname%-git}/resources/" "${pkgname%-git}-linux-x64/resources/app.asar"
     install -Dm644 -t "$pkgdir/usr/share/licences/${pkgname%-git}/" LICENSE
 }
diff --git a/ezra-project.desktop b/ezra-project.desktop
deleted file mode 100644
index 1cc8b52d3ad6..000000000000
--- a/ezra-project.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Ezra Project
-Comment=Bible study software focussing on topical study based on keywords
-Exec=ezra-project
-Terminal=false
-Type=Application
-Icon=ezra-project