[tbb-commits] [tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated: fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser

[gitolite role]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-102.4.0esr-12.0-2
in repository tor-browser.

The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-2 by this push:
     new 764c7768f12e fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
764c7768f12e is described below

commit 764c7768f12e17e3177221f73d9a123b07666f3f
Author: Richard Pospesel <richard at torproject.org>
AuthorDate: Thu Nov 17 15:34:54 2022 +0000

    fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
    
    Bug 41455: Tor Browser dev build cannot launch tor
---
 tools/torbrowser/deploy.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/torbrowser/deploy.sh b/tools/torbrowser/deploy.sh
index 9f2ebd58cbe3..bd2fca7bda7f 100755
--- a/tools/torbrowser/deploy.sh
+++ b/tools/torbrowser/deploy.sh
@@ -18,6 +18,13 @@ rm -rf $BUILD_OUTPUT/_omni
 # cd $BUILD_OUTPUT/_omni && zip -Xmr $BUILD_OUTPUT/dist/firefox/browser/omni.ja chrome/browser/content/browser/manual
 # rm -rf $BUILD_OUTPUT/_omni
 
+# backup the startup script
+mv $BINARIES/dev/Browser/firefox $BINARIES/dev/Browser/firefox.bak
+
 # copy binaries
 cp -r $BUILD_OUTPUT/dist/firefox/* $BINARIES/dev/Browser
 rm -rf $BINARIES/dev/Browser/TorBrowser/Data/Browser/profile.default/startupCache
+
+# shuffle firefox bin around and restore script to match a real deployment
+mv $BINARIES/dev/Browser/firefox $BINARIES/dev/Browser/firefox.real
+mv $BINARIES/dev/Browser/firefox.bak $BINARIES/dev/Browser/firefox

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.