Page MenuHomePhabricator

simplify tb-starter function tb_detect_starter_bin
Open, LowPublic

Description

Now that https://trac.torproject.org/projects/tor/ticket/18022 was fixed, can be simplified.

In what TBB version this was fixed?
In 7.5.6? No.
In 8.x?

By the time this gets fixed it should be available in the stable version of Tor Browser already.


Simplified version:

tb_detect_starter_bin() {
   if [ ! "$tb_starter_bin" = "" ]; then
      return 0
   fi

   if [ -x "$tb_browser_folder/start-tor-browser.desktop" ]; then
      tb_starter_bin="$tb_browser_folder/start-tor-browser.desktop"
   else
      local MSG="Neither <code>$tb_browser_folder/Browser/start-tor-browser</code> nor\
<code>$tb_browser_folder/start-tor-browser</code> nor \
<code>$tb_browser_folder/start-tor-browser.desktop</code> is executable."
      $output ${output_opts[@]} --messagex --typex "error" --titlex "$TITLE" --message "$MSG" --done
      $output ${output_opts[@]} --messagecli --typecli "error" --titlecli "$TITLE" --message "$MSG" --done
      exit 2
   fi
}

Details

Impact
Low