Commit ae5f3f9f authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 20118: Don't unpack HTTPS Everywhere anymore 

Starting with version 5.2.2 HTTPS Everywhere is not unpacked anymore.
We should keep it unpacked as well, especially as that fixes usability
issues like #20033.
parent 23bea36e

gitian/descriptors/linux/gitian-bundle.yml

+3 −6
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ script: | 
  # directory named tor-browser (instead of tor-browser_en-US). Therefore we

  # stage everything under tor-browser-stage to avoid a conflict.

  TB_STAGE_DIR=tor-browser-stage

  mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff@eff.org

  mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions

  mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions

  mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/Caches

  mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Docs/sources/
@@ -109,16 +109,13 @@ script: | 
  rm -f .git/refs/heads/master

  ./makexpi.sh

  # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.

  rm ./pkg/*-amo.xpi

  cp pkg/*.xpi ../${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@eff.org.xpi

  rm pkg/*-amo.xpi

  cp pkg/*.xpi ../${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff@eff.org.xpi

  cd ..

  #

  cp *.xpi ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/

  cd ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions

  mv noscript@noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi

  cd https-everywhere-eff@eff.org/

  unzip ../https-everywhere@eff.org.xpi

  rm ../https-everywhere@eff.org.xpi

  cd ~/build

  #

  cd meek/firefox

gitian/descriptors/mac/gitian-bundle.yml

+3 −6
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ script: | 
  MARTOOLS=~/build/mar-tools

  #

  mkdir -p $OUTDIR/

  mkdir -p $TORBROWSER_NAME.app/$EXTSPATH/https-everywhere-eff@eff.org

  mkdir -p $TORBROWSER_NAME.app/$EXTSPATH

  mkdir -p $TORBROWSER_NAME.app/$MEEKPROFILEPATH/extensions

  mkdir -p $TORBROWSER_NAME.app/$DOCSPATH/sources

  mkdir -p $TORBROWSER_NAME.app/Contents/MacOS
@@ -139,16 +139,13 @@ script: | 
  rm -f .git/refs/heads/master

  ./makexpi.sh

  # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.

  rm ./pkg/*-amo.xpi

  cp pkg/*.xpi ../$TORBROWSER_NAME.app/$EXTSPATH/https-everywhere@eff.org.xpi

  rm pkg/*-amo.xpi

  cp pkg/*.xpi ../$TORBROWSER_NAME.app/$EXTSPATH/https-everywhere-eff@eff.org.xpi

  cd ..

  #

  cp *.xpi ./$TORBROWSER_NAME.app/$EXTSPATH/

  cd $TORBROWSER_NAME.app/$EXTSPATH/

  mv noscript@noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi

  cd https-everywhere-eff@eff.org

  unzip ../https-everywhere@eff.org.xpi

  rm ../https-everywhere@eff.org.xpi

  cd ~/build/

  #

  cd meek/firefox

gitian/descriptors/windows/gitian-bundle.yml

+3 −6
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ script: | 
  export PATH=$INSTDIR/nsis/bin:$PATH

  #

  mkdir -p $OUTDIR/

  mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff@eff.org

  mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions

  mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions

  mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/Caches

  mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Docs/sources
@@ -109,16 +109,13 @@ script: | 
  rm -f .git/refs/heads/master

  ./makexpi.sh

  # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.

  rm ./pkg/*-amo.xpi

  cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@eff.org.xpi

  rm pkg/*-amo.xpi

  cp pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff@eff.org.xpi

  cd ..

  #

  cp *.xpi tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions

  cd tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions

  mv noscript@noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi

  cd https-everywhere-eff@eff.org

  unzip ../https-everywhere@eff.org.xpi

  rm ../https-everywhere@eff.org.xpi

  cd ~/build/

  #

  cd meek/firefox