[tbb-commits] [tor-browser-bundle/master] Switch the install shortcut location to /Applications.

Fri Mar 7 07:24:17 UTC 2014

commit 02d79a009b0a13d7e115d5f8c71e1298b4982ff9
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Sun Mar 2 23:31:00 2014 -0800

    Switch the install shortcut location to /Applications.
    
    Mac users still get lost by a default install location to Desktop.. :/
    
    In case we decide to do more extensive A/B testing: Keep skeletons for both
    Desktop and Application DMG templates around.
---
 Bundle-Data/mac-applications.dmg/.DS_Store                   |  Bin 0 -> 12292 bytes
 Bundle-Data/mac-applications.dmg/.VolumeIcon.icns            |  Bin 0 -> 242224 bytes
 Bundle-Data/mac-applications.dmg/.background/background.png  |  Bin 0 -> 50020 bytes
 Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 |  Bin 0 -> 173 bytes
 Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid   |    1 +
 Bundle-Data/mac-applications.dmg/Applications                |    1 +
 Bundle-Data/mac-desktop.dmg/.DS_Store                        |  Bin 0 -> 12292 bytes
 Bundle-Data/mac-desktop.dmg/._Desktop                        |  Bin 0 -> 303592 bytes
 Bundle-Data/mac-desktop.dmg/.background/background.png       |  Bin 0 -> 50020 bytes
 Bundle-Data/mac-desktop.dmg/Desktop                          |  Bin 0 -> 300120 bytes
 Bundle-Data/mac.dmg/.DS_Store                                |  Bin 12292 -> 0 bytes
 Bundle-Data/mac.dmg/._Desktop                                |  Bin 303592 -> 0 bytes
 Bundle-Data/mac.dmg/.background/background.png               |  Bin 50020 -> 0 bytes
 Bundle-Data/mac.dmg/Desktop                                  |  Bin 300120 -> 0 bytes
 gitian/descriptors/mac/gitian-bundle.yml                     |    5 +++--
 gitian/mkbundle-mac.sh                                       |    9 ++++++---
 16 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Bundle-Data/mac-applications.dmg/.DS_Store b/Bundle-Data/mac-applications.dmg/.DS_Store
new file mode 100644
index 0000000..aeb3104
Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.DS_Store differ
diff --git a/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns
new file mode 100644
index 0000000..481914f
Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns differ
diff --git a/Bundle-Data/mac-applications.dmg/.background/background.png b/Bundle-Data/mac-applications.dmg/.background/background.png
new file mode 100644
index 0000000..94e4584
Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.background/background.png differ
diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60
new file mode 100644
index 0000000..e21068d
Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 differ
diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid
new file mode 100644
index 0000000..538367d
--- /dev/null
+++ b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid
@@ -0,0 +1 @@
+B29020CB-1603-4E1C-8C56-5C8A4434D120
\ No newline at end of file
diff --git a/Bundle-Data/mac-applications.dmg/Applications b/Bundle-Data/mac-applications.dmg/Applications
new file mode 120000
index 0000000..bd2d47f
--- /dev/null
+++ b/Bundle-Data/mac-applications.dmg/Applications
@@ -0,0 +1 @@
+/Applications
\ No newline at end of file
diff --git a/Bundle-Data/mac-desktop.dmg/.DS_Store b/Bundle-Data/mac-desktop.dmg/.DS_Store
new file mode 100644
index 0000000..9bec18c
Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.DS_Store differ
diff --git a/Bundle-Data/mac-desktop.dmg/._Desktop b/Bundle-Data/mac-desktop.dmg/._Desktop
new file mode 100644
index 0000000..a1e0b7f
Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/._Desktop differ
diff --git a/Bundle-Data/mac-desktop.dmg/.background/background.png b/Bundle-Data/mac-desktop.dmg/.background/background.png
new file mode 100644
index 0000000..94e4584
Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.background/background.png differ
diff --git a/Bundle-Data/mac-desktop.dmg/Desktop b/Bundle-Data/mac-desktop.dmg/Desktop
new file mode 100644
index 0000000..3c88450
Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/Desktop differ
diff --git a/Bundle-Data/mac.dmg/.DS_Store b/Bundle-Data/mac.dmg/.DS_Store
deleted file mode 100644
index 9bec18c..0000000
Binary files a/Bundle-Data/mac.dmg/.DS_Store and /dev/null differ
diff --git a/Bundle-Data/mac.dmg/._Desktop b/Bundle-Data/mac.dmg/._Desktop
deleted file mode 100644
index a1e0b7f..0000000
Binary files a/Bundle-Data/mac.dmg/._Desktop and /dev/null differ
diff --git a/Bundle-Data/mac.dmg/.background/background.png b/Bundle-Data/mac.dmg/.background/background.png
deleted file mode 100644
index 94e4584..0000000
Binary files a/Bundle-Data/mac.dmg/.background/background.png and /dev/null differ
diff --git a/Bundle-Data/mac.dmg/Desktop b/Bundle-Data/mac.dmg/Desktop
deleted file mode 100644
index 3c88450..0000000
Binary files a/Bundle-Data/mac.dmg/Desktop and /dev/null differ
diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index 55a6777..4325a1b 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -36,7 +36,8 @@ files:
 - "bridge_prefs.js"
 - "relativelink-src.zip"
 - "mac-skeleton.zip"
-- "mac-dmg.zip"
+- "dmg-applications.tar.xz"
+- "dmg-desktop.tar.xz"
 - "mac-langpacks.zip"
 - "noscript at noscript.net.xpi"
 - "dzip.sh"
@@ -148,7 +149,7 @@ script: |
   make
   cd ../../
   cd dmg
-  unzip ~/build/mac-dmg.zip
+  tar -Jxvf ~/build/dmg-applications.tar.xz # FIXME: Desktop or Application as dest?
   cd ..
   #
   # FF24 puts the prefs in the browser jar:
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index 18e0f8a..a9cbacb 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -63,9 +63,12 @@ cp mac-tor.sh $GITIAN_DIR/inputs/
 cd mac
 rm -f $GITIAN_DIR/inputs/mac-skeleton.zip
 $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip .
-cd ../mac.dmg
-rm -f $GITIAN_DIR/inputs/mac-dmg.zip
-$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-dmg.zip .
+cd ../mac-desktop.dmg
+rm -f $GITIAN_DIR/inputs/dmg-desktop.tar.xz
+$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-desktop.tar.xz .
+cd ../mac-applications.dmg
+rm -f $GITIAN_DIR/inputs/dmg-applications.tar-gz
+$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-applications.tar.xz .
 
 cd $WRAPPER_DIR
 



