fix errors

2 files changed, 16 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 853d08316709..87a277bcdef3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = salesforce2sql-bin
 	pkgdesc = Electron app to convert a Salesforce org's schema into a similarly shaped database.
 	pkgver = 0.9.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/acrosman/Salesforce2Sql
 	arch = x86_64
 	license = MIT
@@ -14,7 +14,6 @@ pkgbase = salesforce2sql-bin
 	depends = at-spi2-core
 	depends = bash
 	depends = pango
-	depends = nodejs
 	depends = make
 	depends = libxfixes
 	depends = expat
@@ -33,8 +32,9 @@ pkgbase = salesforce2sql-bin
 	depends = mesa
 	depends = nspr
 	depends = python-setuptools
-	provides = salesforce2sql-0.9.0
+	provides = salesforce2sql=0.9.0
 	conflicts = salesforce2sql
+	options = !strip
 	source = salesforce2sql-0.9.0.rpm::https://github.com/acrosman/Salesforce2Sql/releases/download/v0.9.0/salesforce2sql-0.9.0-1.x86_64.rpm
 	sha256sums = 54691aea18d09b8681fba38a568960673cea0011a1c1cfc3a378a72cb3babcd4
 
diff --git a/PKGBUILD b/PKGBUILD
index 881f1020a6d8..b04d6266d8a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,26 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=salesforce2sql-bin
 pkgver=0.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Electron app to convert a Salesforce org's schema into a similarly shaped database."
 arch=('x86_64')
 url="https://github.com/acrosman/Salesforce2Sql"
 license=('MIT')
-depends=('gtk3' 'alsa-lib' 'libxcb' 'nss' 'libdrm' 'libxrandr' 'at-spi2-core' 'bash' 'pango' 'nodejs' 'make' 'libxfixes' 'expat' 'libxcomposite' \
-    'libxext' 'cairo' 'dbus' 'python' 'glib2' 'glibc' 'libxkbcommon' 'gcc-libs' 'libx11' 'libcups' 'libxdamage' 'mesa' 'nspr' 'python-setuptools')
-provides=("${pkgname%-bin}-${pkgver}")
+provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
+options=('!strip')
+depends=('gtk3' 'alsa-lib' 'libxcb' 'nss' 'libdrm' 'libxrandr' 'at-spi2-core' 'bash' 'pango' 'make' 'libxfixes' 'expat' 'libxcomposite' \
+    'libxext' 'cairo' 'dbus' 'python' 'glib2' 'glibc' 'libxkbcommon' 'gcc-libs' 'libx11' 'libcups' 'libxdamage' 'mesa' 'nspr' 'python-setuptools')
 source=("${pkgname%-bin}-${pkgver}.rpm::${url}/releases/download/v${pkgver}/${pkgname%-bin}-${pkgver}-1.${CARCH}.rpm")
 sha256sums=('54691aea18d09b8681fba38a568960673cea0011a1c1cfc3a378a72cb3babcd4')
+prepare() {
+    sed "s|%U|--no-sandbox %U|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+}
 package() {
-   install -Dm755 -d "${pkgdir}/opt" "${pkgdir}/usr"
+   install -Dm755 -d "${pkgdir}/"{opt/,usr/bin}
    cp -r "${srcdir}/usr/lib/${pkgname%-bin}" "${pkgdir}/opt/${pkgname%-bin}"
-   cp -r "${srcdir}/usr/share" "${pkgdir}/usr"
-   sed "s|Exec=${pkgname%-bin}|Exec=/opt/${pkgname%-bin}/${pkgname%-bin}|g" -i "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
-   install -Dm644 "${pkgdir}/opt/${pkgname%-bin}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+   ln -sf "/opt/${pkgname%-bin}/${pkgname%-bin}" "${pkgdir}/usr/bin/${pkgname%-bin}"
+   install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
+   install -Dm644 "${srcdir}/usr/share/pixmaps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
+   install -Dm644 "${srcdir}/usr/lib/${pkgname%-bin}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file