boklm pushed to branch main at The Tor Project / Applications /
tor-browser-build
Commits:
8d74923f by Nicolas Vigier at 2024-11-18T16:32:56+01:00
Bug 41298: Remove `--detach` parameter from .desktop files
- - - - -
3 changed files:
- projects/browser/RelativeLink/start-browser
- projects/browser/RelativeLink/start-browser.desktop
- projects/linux-packages/browser.desktop.in
Changes:
=====================================
projects/browser/RelativeLink/start-browser
=====================================
@@ -242,7 +242,7 @@ if test -z "$system_install"; then
sed -i -e "s,^Name=.*,Name=[% c('var/Project_Name') %],g" ../start-[%
c('var/project-name') %].desktop
sed -i -e
"s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g"
../start-[% c('var/project-name') %].desktop
sed -i -e
"s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" start-[%
c('var/project-name') %].desktop
- sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-[% c('var/project-name') %]\"
--detach || ([ ! -x \"$PWD/start-[% c('var/project-name') %]\" ] \&\&
\"\$(dirname \"\$*\")\"/Browser/start-[% c('var/project-name') %] --detach)'
dummy %k,g" ../start-[% c('var/project-name') %].desktop
+ sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-[% c('var/project-name') %]\"
|| ([ ! -x \"$PWD/start-[% c('var/project-name') %]\" ] \&\& \"\$(dirname
\"\$*\")\"/Browser/start-[% c('var/project-name') %])' dummy %k,g" ../start-[%
c('var/project-name') %].desktop
if [ "$register_desktop_app" -eq 1 ]; then
mkdir -p "$HOME/.local/share/applications/"
=====================================
projects/browser/RelativeLink/start-browser.desktop
=====================================
@@ -28,7 +28,7 @@ Name=[% c("var/Project_Name") %] Setup
GenericName=Web Browser
Comment=[% c("var/Project_Name") %] is +1 for privacy and −1 for mass
surveillance
Categories=Network;WebBrowser;Security;
-Exec=sh -c '"$(dirname "$*")"/Browser/start-[% c("var/project-name") %]
--detach || ([ ! -x "$(dirname "$*")"/Browser/start-[% c("var/project-name") %]
] && "$(dirname "$*")"/start-[% c("var/project-name") %] --detach)' dummy %k
+Exec=sh -c '"$(dirname "$*")"/Browser/start-[% c("var/project-name") %] || ([
! -x "$(dirname "$*")"/Browser/start-[% c("var/project-name") %] ] &&
"$(dirname "$*")"/start-[% c("var/project-name") %])' dummy %k
X-[% c("var/ProjectName") %]-ExecShell=./Browser/start-[%
c("var/project-name") %] --detach
Icon=web-browser
StartupWMClass=[% c("var/display_name") %]
=====================================
projects/linux-packages/browser.desktop.in
=====================================
@@ -5,7 +5,7 @@ Name=[% c("var/Project_Name") %]
GenericName=Web Browser
Comment=[% c("var/system_pkg/pkg_description") %]
Categories=Network;WebBrowser;
-Exec=/[% c("var/system_pkg/install_path") %]/start-[% c("var/project-name") %]
--detach %u
+Exec=/[% c("var/system_pkg/install_path") %]/start-[% c("var/project-name") %]
%u
Icon=[% c("var/system_pkg/pkg_name") %]
StartupWMClass=[% c("var/display_name") %]
[% IF ! c("var/tor-browser") -%]
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8d74923f35e0fcc005274da1cbb82bfe2d6362bc
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8d74923f35e0fcc005274da1cbb82bfe2d6362bc
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
