Unverified Commit 8d74923f authored by boklm's avatar boklm
Browse files

Bug 41298: Remove `--detach` parameter from .desktop files

parent 4dd16b8c

projects/browser/RelativeLink/start-browser

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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") -%]