[Git][tpo/applications/tor-browser-build][main] 2 commits: MB 295: Change to browser directory instead of HOME in system install

6 May 2024


      boklm pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
4d541c5a by Nicolas Vigier at 2024-05-03T08:10:49+02:00
MB 295: Change to browser directory instead of HOME in system install

- - - - -
3774a75a by Nicolas Vigier at 2024-05-03T08:15:15+02:00
Bug 41135: Don't use full path to start the browser

Using the full path instead of `./` to start the browser seems to break
KeePassXC-Browser.

- - - - -


1 changed file:

- projects/browser/RelativeLink/start-browser


Changes:

=====================================
projects/browser/RelativeLink/start-browser
=====================================
@@ -396,7 +396,7 @@ export GSETTINGS_BACKEND=memory
 # $HOME/.cache/nvidia. We we can easily disable it.
 export __GL_SHADER_DISK_CACHE=0
 
-cd "${HOME}"
+cd "$browser_dir"
 
 # We pass all additional command-line arguments we get to Firefox.
 #
@@ -408,18 +408,18 @@ cd "${HOME}"
 
 if [ "$show_usage" -eq 1 ]; then
   # Display Firefox help, then our help
-  [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] "$browser_dir"/[% c('var/exe_name') %] --help 2>/dev/null
+  [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] --help 2>/dev/null
   print_usage
 elif [ "$detach" -eq 1 ] ; then
-  [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] "$browser_dir"/[% c('var/exe_name') %] "${@}" > "$logfile" 2>&1 </dev/null &
+  [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" > "$logfile" 2>&1 </dev/null &
   disown "$!"
 elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then
-  [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] "$browser_dir"/[% c('var/exe_name') %] "${@}" 2>&1 </dev/null | \
+  [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" 2>&1 </dev/null | \
     tee "$logfile"
 elif [ "$show_output" -eq 1 ]; then
-  [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] "$browser_dir"/[% c('var/exe_name') %] "${@}" < /dev/null
+  [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" < /dev/null
 else
-  [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] "$browser_dir"/[% c('var/exe_name') %] "${@}" > "$logfile" 2>&1 </dev/null
+  [% IF c("var/tor-browser") %]TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD}[% END %] ./[% c('var/exe_name') %] "${@}" > "$logfile" 2>&1 </dev/null
 fi
 
 exit $?



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/9...

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/9...
You're receiving this email because of your account on gitlab.torproject.org.

    

boklm (＠boklm)

tags

participants (1)