fix errors

3 files changed, 23 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c6b8b771128..295fcea2047b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,19 @@
 pkgbase = salesforce2sql-bin
 	pkgdesc = Electron app to convert a Salesforce org's schema into a similarly shaped database.
 	pkgver = 0.9.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/acrosman/Salesforce2Sql
 	arch = x86_64
 	license = MIT
-	makedepends = npm
 	depends = electron22
-	depends = libxcomposite
-	depends = libx11
-	depends = libxdamage
-	depends = mesa
-	depends = gtk3
-	depends = dbus-glib
-	depends = expat
-	depends = nss
-	depends = libxrandr
-	depends = libxext
-	depends = at-spi2-core
-	depends = libxkbcommon
-	depends = pango
-	depends = cairo
-	depends = libcups
-	depends = libxcb
-	depends = nspr
-	depends = libdrm
-	depends = alsa-lib
-	depends = libxfixes
 	depends = python
-	depends = make
 	depends = python-setuptools
+	depends = make
 	provides = salesforce2sql=0.9.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
 	source = salesforce2sql.sh
 	sha256sums = 54691aea18d09b8681fba38a568960673cea0011a1c1cfc3a378a72cb3babcd4
-	sha256sums = af6cd72ad67a27e4373e2b43a102cc1d58129af05baae3ab9981b28527d4cc9e
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = salesforce2sql-bin
diff --git a/PKGBUILD b/PKGBUILD
index 7fa518691d11..20acc3681847 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=salesforce2sql-bin
 pkgver=0.9.0
-pkgrel=4
+_electronversion=22
+pkgrel=5
 pkgdesc="Electron app to convert a Salesforce org's schema into a similarly shaped database."
 arch=('x86_64')
 url="https://github.com/acrosman/Salesforce2Sql"
@@ -9,44 +10,24 @@ license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
-    'electron22'
-    'libxcomposite'
-    'libx11'
-    'libxdamage'
-    'mesa'
-    'gtk3'
-    'dbus-glib'
-    'expat'
-    'nss'
-    'libxrandr'
-    'libxext'
-    'at-spi2-core'
-    'libxkbcommon'
-    'pango'
-    'cairo'
-    'libcups'
-    'libxcb'
-    'nspr'
-    'libdrm'
-    'alsa-lib'
-    'libxfixes'
+    "electron${_electronversion}"
     'python'
-    'make'
     'python-setuptools'
-)
-makedepends=(
-    'npm'
+    'make'
 )
 source=(
     "${pkgname%-bin}-${pkgver}.rpm::${url}/releases/download/v${pkgver}/${pkgname%-bin}-${pkgver}-1.${CARCH}.rpm"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('54691aea18d09b8681fba38a568960673cea0011a1c1cfc3a378a72cb3babcd4'
-            'af6cd72ad67a27e4373e2b43a102cc1d58129af05baae3ab9981b28527d4cc9e')
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 build() {
-    cd "${srcdir}/usr/lib/${pkgname%-bin}/resources"
-    npm add electron-debug
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     sed "s|%U||g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    sed -e '59d' -e'12,16d' -i "${srcdir}/usr/lib/${pkgname%-bin}/resources/app/main.js"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
diff --git a/salesforce2sql.sh b/salesforce2sql.sh
index a79d1d307aad..2ec4412e5c4f 100644
--- a/salesforce2sql.sh
+++ b/salesforce2sql.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron22
-APPDIR="/usr/lib/salesforce2sql"
-export PATH="${APPDIR}:${PATH}"
-#export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app"
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
 fi
\ No newline at end of file