Skip to content

Commit fd4733b

Browse files
authored
Consistently include a space *before* parameters when building exec_string (#270)
This fixes `custom_parameters` having two spaces before it and none after it for Firefox apps.
1 parent 66657e8 commit fd4733b

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

usr/lib/webapp-manager/common.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,12 @@ def get_exec_string(self, browser, codename, custom_parameters, icon, isolate_pr
289289
" --class WebApp-" + codename +
290290
" --name WebApp-" + codename +
291291
" --profile " + firefox_profile_path +
292-
" --no-remote ")
292+
" --no-remote")
293293
if privatewindow:
294-
exec_string += "--private-window "
294+
exec_string += " --private-window"
295295
if custom_parameters:
296296
exec_string += " {}".format(custom_parameters)
297-
exec_string += "\"" + url + "\"" + "'"
297+
exec_string += " \"" + url + "\"" + "'"
298298
# Create a Firefox profile
299299
shutil.copytree('/usr/share/webapp-manager/firefox/profile', firefox_profile_path, dirs_exist_ok = True)
300300
if navbar:
@@ -307,10 +307,10 @@ def get_exec_string(self, browser, codename, custom_parameters, icon, isolate_pr
307307
exec_string = ("sh -c 'XAPP_FORCE_GTKWINDOW_ICON=\"" + icon + "\" " + browser.exec_path +
308308
" --class WebApp-" + codename +
309309
" --profile " + firefox_profile_path +
310-
" --no-remote ")
310+
" --no-remote")
311311
if privatewindow:
312-
exec_string += "--private-window "
313-
exec_string += "\"" + url + "\"" + "'"
312+
exec_string += " --private-window"
313+
exec_string += " \"" + url + "\"" + "'"
314314
# Create a Firefox profile
315315
shutil.copytree('/usr/share/webapp-manager/firefox/profile', firefox_profile_path, dirs_exist_ok = True)
316316
if navbar:
@@ -326,7 +326,7 @@ def get_exec_string(self, browser, codename, custom_parameters, icon, isolate_pr
326326
exec_string = browser.exec_path
327327
exec_string += " --application-mode "
328328
exec_string += " --profile=\"" + epiphany_orig_prof_dir + "\""
329-
exec_string += " " + "\"" + url + "\""
329+
exec_string += " \"" + url + "\""
330330
if custom_parameters:
331331
exec_string += " {}".format(custom_parameters)
332332
else:

0 commit comments

Comments
 (0)