fix errors

3 files changed, 20 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5984420f644a..22c41e0c73e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dooble-bin
 	pkgdesc = Web browser based on QtWebEngine
 	pkgver = 2023.11.30
-	pkgrel = 1
+	pkgrel = 2
 	url = https://textbrowser.github.io/dooble
 	arch = x86_64
 	license = custom
@@ -64,6 +64,6 @@ pkgbase = dooble-bin
 	source = dooble.sh
 	sha256sums = ccbe838464b18cb3ae16580f0173df4346914504bccc6fc14db1bf537eb9da6d
 	sha256sums = c60bf2d6a8bfdf7c7418bba91c6767cbb4b48dccae36dd5d9ffdb48f756815dd
-	sha256sums = 2cbee36cf9e2b0a2c47c72ea97b5412e87009bc47b60bea9f8730af584b3e2c2
+	sha256sums = fb6e83ced7565462bc103d45bfd82a2ea1fde0b6e549bd8c4c887c5ecd96c2d9
 
 pkgname = dooble-bin
diff --git a/PKGBUILD b/PKGBUILD
index 55ea434e8f93..1c66358be5d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,14 @@
 pkgname=dooble-bin
 _pkgname=Dooble
 pkgver=2023.11.30
-pkgrel=1
+pkgrel=2
 pkgdesc="Web browser based on QtWebEngine"
 arch=("x86_64")
 url="https://textbrowser.github.io/dooble"
 _ghurl="https://github.com/textbrowser/dooble"
 license=('custom')
+provides=("${pkgname%-bin}=${pkgver}")
+conflicts=("${pkgname%-bin}")
 depends=(
   'at-spi2-core'
   'cairo'
@@ -70,8 +72,6 @@ optdependes=(
 makedepends=(
   'findutils'
 )
-provides=("${pkgname%-bin}=${pkgver}")
-conflicts=("${pkgname%-bin}")
 source=(
   "${pkgname%-bin}-${pkgver}.tar.gz::${_ghurl}/releases/download/${pkgver}/${_pkgname}-${pkgver}_amd64.deb"
   "LICENSE-${pkgver}::https://raw.githubusercontent.com/textbrowser/dooble/${pkgver}/LICENSE"
@@ -79,16 +79,19 @@ source=(
 )
 sha256sums=('ccbe838464b18cb3ae16580f0173df4346914504bccc6fc14db1bf537eb9da6d'
             'c60bf2d6a8bfdf7c7418bba91c6767cbb4b48dccae36dd5d9ffdb48f756815dd'
-            '2cbee36cf9e2b0a2c47c72ea97b5412e87009bc47b60bea9f8730af584b3e2c2')
+            'fb6e83ced7565462bc103d45bfd82a2ea1fde0b6e549bd8c4c887c5ecd96c2d9')
 build() {
+    sed -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@runname@|${_pkgname}|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data.tar.zst"
     cp "${srcdir}/opt/${pkgname%-bin}/Translations/${pkgname%-bin}_zh_CN_simple.qm" \
-      "${srcdir}/opt/${pkgname%-bin}/Translations/${pkgname%-bin}_zh_CN.qm"
+       "${srcdir}/opt/${pkgname%-bin}/Translations/${pkgname%-bin}_zh_CN.qm"
     sed "s|/usr/bin/${pkgname%-bin}|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
-    cp -r "${srcdir}/opt" "${pkgdir}/opt"
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    cp -r "${srcdir}/opt" "${pkgdir}"
     install -Dm644 "${srcdir}/LICENSE-${pkgver}" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
     install -Dm644 "${srcdir}/usr/share/pixmaps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
diff --git a/dooble.sh b/dooble.sh
index 767b81a8974d..e339ae4514e4 100644
--- a/dooble.sh
+++ b/dooble.sh
@@ -1,17 +1,17 @@
 #!/bin/sh
 set -e
-APPDIR=/opt/dooble
+_APPDIR=/opt/@appname@
+_RUNNAME="${_APPDIR}/@runname@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/Lib:${LD_LIBRARY_PATH}"
 export AA_ENABLEHIGHDPISCALING=1
 export AA_USEHIGHDPIPIXMAPS=1
 export DOOBLE_ADDRESS_WIDGET_HEIGHT_OFFSET=0
-export DOOBLE_GOOGLE_TRANSLATE_URL="https://%1.translate.goog/\
-%2?_x_tr_sl=auto&_x_tr_tl=%3&_x_tr_hl=%3&_x_tr_pto=wapp"
+export DOOBLE_GOOGLE_TRANSLATE_URL="https://%1.translate.goog/%2?_x_tr_sl=auto&_x_tr_tl=%3&_x_tr_hl=%3&_x_tr_pto=wapp"
 export DOOBLE_TAB_HEIGHT_OFFSET=5
 export QT_AUTO_SCREEN_SCALE_FACTOR=1
 export QT_X11_NO_MITSHM=1
-export QTWEBENGINE_LOCALES_PATH="${APPDIR}/qtwebengine_locales:${QTWEBENGINE_LOCALES_PATH}"
-export LD_LIBRARY_PATH="${APPDIR}/Lib:${LD_LIBRARY_PATH}"
-export QT_PLUGIN_PATH="${APPDIR}/plugins:${QT_PLUGIN_PATH}"
-cd "${APPDIR}"
-exec ./Dooble "$@"
-exit $?
\ No newline at end of file
+export QTWEBENGINE_LOCALES_PATH="${_APPDIR}/qtwebengine_locales:${QTWEBENGINE_LOCALES_PATH}"
+export QT_PLUGIN_PATH="${_APPDIR}/plugins:${QT_PLUGIN_PATH}"
+cd "${_APPDIR}"
+exec "${_RUNNAME}" "$@" | exit $?
\ No newline at end of file