commit 827703ba942616d18f4cdc889d8345140b58bf92 Author: Nicolas Vigier <boklm@torproject.org> Date: Mon Jun 29 14:41:30 2015 +0200 Use bsdtar to extract tor-browser dmg Contrary to 7z, bsdtar keeps files permissions while extracting iso9660 images. --- projects/tor-messenger/build.osx | 2 +- projects/tor-messenger/config | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index ee6a8b6..069c8d4 100644 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -12,7 +12,7 @@ cd torbrowser mkdir tor-launcher@torproject.org 7z x -y -otor-launcher@torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] 7z x $rootdir/[% c('input_files_by_name/tor-browser') %] -7z x '0.unknown partition' +bsdtar xf '0.unknown partition' sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults mkdir -p tor-launcher@torproject.org/TorBrowser/Data diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 5d57004..f19a0c0 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -52,3 +52,4 @@ targets: filename_ext: 'dmg' arch_deps: - genisoimage + - bsdtar