Skip to content

Commit

Permalink
Consistently include a space *before* parameters when building exec_s…
Browse files Browse the repository at this point in the history
…tring (#270)

This fixes `custom_parameters` having two spaces before it and none after it for Firefox apps.
  • Loading branch information
BudgieInWA authored Nov 27, 2023
1 parent 66657e8 commit fd4733b
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions usr/lib/webapp-manager/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,12 +289,12 @@ def get_exec_string(self, browser, codename, custom_parameters, icon, isolate_pr
" --class WebApp-" + codename +
" --name WebApp-" + codename +
" --profile " + firefox_profile_path +
" --no-remote ")
" --no-remote")
if privatewindow:
exec_string += "--private-window "
exec_string += " --private-window"
if custom_parameters:
exec_string += " {}".format(custom_parameters)
exec_string += "\"" + url + "\"" + "'"
exec_string += " \"" + url + "\"" + "'"
# Create a Firefox profile
shutil.copytree('/usr/share/webapp-manager/firefox/profile', firefox_profile_path, dirs_exist_ok = True)
if navbar:
Expand All @@ -307,10 +307,10 @@ def get_exec_string(self, browser, codename, custom_parameters, icon, isolate_pr
exec_string = ("sh -c 'XAPP_FORCE_GTKWINDOW_ICON=\"" + icon + "\" " + browser.exec_path +
" --class WebApp-" + codename +
" --profile " + firefox_profile_path +
" --no-remote ")
" --no-remote")
if privatewindow:
exec_string += "--private-window "
exec_string += "\"" + url + "\"" + "'"
exec_string += " --private-window"
exec_string += " \"" + url + "\"" + "'"
# Create a Firefox profile
shutil.copytree('/usr/share/webapp-manager/firefox/profile', firefox_profile_path, dirs_exist_ok = True)
if navbar:
Expand All @@ -326,7 +326,7 @@ def get_exec_string(self, browser, codename, custom_parameters, icon, isolate_pr
exec_string = browser.exec_path
exec_string += " --application-mode "
exec_string += " --profile=\"" + epiphany_orig_prof_dir + "\""
exec_string += " " + "\"" + url + "\""
exec_string += " \"" + url + "\""
if custom_parameters:
exec_string += " {}".format(custom_parameters)
else:
Expand Down

0 comments on commit fd4733b

Please sign in to comment.