update to 0.10.0

3 files changed, 23 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fdd78b75553..dd0184cb85e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = salesforce2sql-bin
 	pkgdesc = Electron app to convert a Salesforce org's schema into a similarly shaped database.
-	pkgver = 0.9.0
-	pkgrel = 6
+	pkgver = 0.10.0
+	pkgrel = 1
 	url = https://github.com/acrosman/Salesforce2Sql
 	arch = x86_64
 	license = MIT
-	depends = electron22
+	depends = electron28
 	depends = python
 	depends = python-setuptools
-	depends = make
-	provides = salesforce2sql=0.9.0
+	depends = nodejs
+	provides = salesforce2sql=0.10.0
 	conflicts = salesforce2sql
-	source = salesforce2sql-0.9.0.rpm::https://github.com/acrosman/Salesforce2Sql/releases/download/v0.9.0/salesforce2sql-0.9.0-1.x86_64.rpm
+	options = !strip
+	source = salesforce2sql-0.10.0.rpm::https://github.com/acrosman/Salesforce2Sql/releases/download/v0.10.0/salesforce2sql-0.10.0-1.x86_64.rpm
 	source = salesforce2sql.sh
-	sha256sums = 54691aea18d09b8681fba38a568960673cea0011a1c1cfc3a378a72cb3babcd4
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 5abdb9dfc1c43bb2fa6cc6e11bc98d049051d7589d3fe123d3184284fc9ccf49
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = salesforce2sql-bin
diff --git a/PKGBUILD b/PKGBUILD
index 5a12ce6fc102..2a8b5424cc52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=salesforce2sql-bin
-pkgver=0.9.0
-_electronversion=22
-pkgrel=6
+pkgver=0.10.0
+_electronversion=28
+pkgrel=1
 pkgdesc="Electron app to convert a Salesforce org's schema into a similarly shaped database."
 arch=('x86_64')
 url="https://github.com/acrosman/Salesforce2Sql"
@@ -13,18 +13,21 @@ depends=(
     "electron${_electronversion}"
     'python'
     'python-setuptools'
-    'make'
+    'nodejs'
+)
+options=(
+    '!strip'
 )
 source=(
     "${pkgname%-bin}-${pkgver}.rpm::${url}/releases/download/v${pkgver}/${pkgname%-bin}-${pkgver}-1.${CARCH}.rpm"
     "${pkgname%-bin}.sh"
 )
-sha256sums=('54691aea18d09b8681fba38a568960673cea0011a1c1cfc3a378a72cb3babcd4'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+sha256sums=('5abdb9dfc1c43bb2fa6cc6e11bc98d049051d7589d3fe123d3184284fc9ccf49'
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
-        -e "s|@appasar@|app|g" \
+        -e "s|@runname@|app|g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
     sed -e '59d' -e'12,16d' -i "${srcdir}/usr/lib/${pkgname%-bin}/resources/app/main.js"
 }
diff --git a/salesforce2sql.sh b/salesforce2sql.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/salesforce2sql.sh
+++ b/salesforce2sql.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 set -e
 _APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
 export NODE_ENV=production
 cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron@electronversion@ "${_ASAR}" "$@"
+    exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit
\ No newline at end of file
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file