[tor-commits] [tor-browser-build/master] Revert "Bug 28546: Rebrand Tor Browser's Window's Installer"

[gk at torproject.org]

commit b25cd533f1ae26c2ee65bc5bef57a33d98f83363
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Jan 28 09:32:00 2019 +0000

    Revert "Bug 28546: Rebrand Tor Browser's Window's Installer"
    
    This reverts commit 031ecd732636c627ea3b6343869d96ccbf3d2df0.
    
    We need to back this out for now because it is causing reproducibility
    issues, see #29185.
---
 projects/tbb-windows-installer/config | 2 +-
 projects/tor-browser/build            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/tbb-windows-installer/config b/projects/tbb-windows-installer/config
index 0ec7b0a..a990229 100644
--- a/projects/tbb-windows-installer/config
+++ b/projects/tbb-windows-installer/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.6
+version: 0.5
 git_url: https://github.com/moba/tbb-windows-installer.git
 git_hash: 'v[% c("version") %]'
 tag_gpg_id: 1
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index bc663c2..4661f7a 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -303,7 +303,7 @@ cd $distdir
 [% ELSIF c("var/windows") %]
   find "$PKG_DIR" -exec [% c("var/touch") %] {} \;
   pushd "$PKG_DIR"
-  makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi
+  makensis torbrowser.nsi
   # Working around NSIS braindamage
   mv torbrowser-install.exe torbrowser-install-tmp.exe
   python $rootdir/pe_checksum_fix.py
@@ -392,7 +392,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
       [% ELSIF c("var/windows") %]
         find "[% tbdir %]" -exec [% c("var/touch") %] {} \;
         pushd "[% tbdir %]"
-        makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi
+        makensis torbrowser.nsi
         # Working around NSIS braindamage
         mv torbrowser-install.exe torbrowser-install-tmp.exe
         python $rootdir/pe_checksum_fix.py