use env variable

3 files changed, 7 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 817086dc63c8..fe1eb24ea33f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linuxqq-firejail
 	pkgdesc = Run QQ in Firejail (security sandbox). Install linuxqq before this.
-	pkgver = 0.0.2
+	pkgver = 0.0.3
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/BeautyYuYanli/linuxqq-firejail
@@ -11,8 +11,6 @@ pkgbase = linuxqq-firejail
 	depends = xdg-desktop-portal
 	depends = flatpak-xdg-utils
 	source = linuxqq.profile
-	source = xdg-open
-	sha512sums = a4ee0f052e34868363067afd7a0964a1e3b8967c153fac0a52b0669e2f1ab84c0a1a2709f855c42fb3bb5271c3c909d7bdae285772e3b599cb3a77f6b298d376
-	sha512sums = 78ed919ce27036d57f34bca748d8834948269e20e45a6db4e487989a97061922c6cfb0dcbc8faea8cf66008aaf5cd769570c293300d9de1281a08063fa3a7c4a
+	sha512sums = 8f5f51ad0c90594ceaae60d67a5c44c7444fcc65d58e4fb942a9570d9a088c69e2bfb49140af2cb99c774c8bd2f5cd7f7e9456c23429ea7a0147871e7c5841be
 
 pkgname = linuxqq-firejail
diff --git a/PKGBUILD b/PKGBUILD
index 36ebf1603e49..a46191af2782 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: cubercsl <hi@cubercsl.site>
 # Contributor: glitsj16
 pkgname=linuxqq-firejail
-pkgver=0.0.2
+pkgver=0.0.3
 pkgrel=1
 epoch=1
 pkgdesc='Run QQ in Firejail (security sandbox). Install linuxqq before this.'
@@ -14,11 +14,9 @@ depends=('firejail' 'xdg-desktop-portal' 'flatpak-xdg-utils')
 profile="linuxqq.profile"
 source=(
 	"${profile}"
-	"xdg-open"
 )
 sha512sums=(
-	'a4ee0f052e34868363067afd7a0964a1e3b8967c153fac0a52b0669e2f1ab84c0a1a2709f855c42fb3bb5271c3c909d7bdae285772e3b599cb3a77f6b298d376'
-	'78ed919ce27036d57f34bca748d8834948269e20e45a6db4e487989a97061922c6cfb0dcbc8faea8cf66008aaf5cd769570c293300d9de1281a08063fa3a7c4a'
+	'8f5f51ad0c90594ceaae60d67a5c44c7444fcc65d58e4fb942a9570d9a088c69e2bfb49140af2cb99c774c8bd2f5cd7f7e9456c23429ea7a0147871e7c5841be'
 )
 
 package() {
@@ -27,14 +25,11 @@ package() {
 	mkdir "${pkgdir}/etc/firejail" -p
 	mv "${profile}" "${pkgdir}/etc/firejail/"
 
-	# Patch xdg-open
-	mkdir "${pkgdir}/usr/local/bin/" -p
-	mv "xdg-open" "${pkgdir}/usr/local/bin/"
-
 	# Wrap launcher
 	echo "  -> Wrapping launcher..."
 	mkdir "${pkgdir}/usr/share/applications" -p
 	cp "/usr/share/applications/qq.desktop" "${pkgdir}/usr/share/applications/qq-firejail.desktop"
 	sed -i "2s!QQ!QQ in Firejail!" "${pkgdir}/usr/share/applications/qq-firejail.desktop"
-	sed -i "3s!/usr/bin/linuxqq!firejail --profile=/etc/firejail/${profile} /usr/bin/linuxqq!" "${pkgdir}/usr/share/applications/qq-firejail.desktop"
+	sed -i "3s!Exec=!Exec=sh -c \"env PATH=/usr/lib/flatpak-xdg-utils:\$PATH firejail --profile=/etc/firejail/${profile} !" "${pkgdir}/usr/share/applications/qq-firejail.desktop"
+	sed -i "3s!%U!\"%U!" "${pkgdir}/usr/share/applications/qq-firejail.desktop"
 }
diff --git a/linuxqq.profile b/linuxqq.profile
index f5a4a25b84df..8c2ac500b44a 100644
--- a/linuxqq.profile
+++ b/linuxqq.profile
@@ -1,26 +1,12 @@
 # Firejail profile for linuxqq
 # Description: IM client based on Electron
-# This file is overwritten after every install/update
 # Persistent local customizations
 include linuxqq.local
 # Persistent global definitions
 include globals.local
 
-# REMINDER: add counterpart `blacklist ${HOME}/.config/QQ` to `disable-programs.inc`
 noblacklist ${HOME}/.config/QQ
 
-# Allow opening hyperlinks with Firefox
-# profiles access
-noblacklist ${HOME}/.mozilla
-whitelist ${HOME}/.mozilla
-whitelist ${HOME}/.mozilla/firefox/profiles.ini
-read-only ${HOME}/.mozilla/firefox/profiles.ini
-# shell access
-include allow-bin-sh.inc
-include disable-shell.inc
-# D-Bus access
-dbus-user.talk org.mozilla.*
-
 mkdir ${HOME}/.config/QQ
 whitelist ${HOME}/.config/QQ
 whitelist ${DESKTOP}
@@ -28,12 +14,7 @@ whitelist ${DESKTOP}
 ignore apparmor
 noprinters
 
-# If you don't need/want to save anything to disk you can add `private` to your linuxqq.local.
-#private
-# REMINDER: QQ executable name on Debian/Ubuntu is `qq`
-# https://github.com/BeautyYuYanli/linuxqq-new-firejail/issues/1#issuecomment-1368366777
-# create an alias profile for that and reshuffle private-bin accordingly
-private-bin awk,bash,cut,echo,egrep,firefox,fish,gio,grep,head,linuxqq,qq,readlink,sed,sh,tclsh,tr,which,www-browser,xdg-mime,xdg-open,x-www-browser
+private-bin linuxqq,xdg-open,xdg-mime
 private-etc alsa,alternatives,ca-certificates,crypto-policies,fonts,group,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,login.defs,machine-id,nsswitch.conf,os-release,passwd,pki,pulse,resolv.conf,ssl,xdg
 private-opt QQ