[tor-commits] [tor-browser-bundle/master] Bug #10832: Automatically set MacOS version in the plist.

[mikeperry at torproject.org]

commit a1bab4013e149eb698a2fe6fb456d96bcf4d520e
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Feb 7 09:57:47 2014 -0800

    Bug #10832: Automatically set MacOS version in the plist.
---
 Bundle-Data/mac/Contents/Info.plist      |    6 +++---
 gitian/descriptors/mac/gitian-bundle.yml |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/mac/Contents/Info.plist b/Bundle-Data/mac/Contents/Info.plist
index 58fea7d..52b7781 100644
--- a/Bundle-Data/mac/Contents/Info.plist
+++ b/Bundle-Data/mac/Contents/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>TorBrowserBundle</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Tor Browser Bundle 3.5.1 Copyright 2014 The Tor Project</string>
+	<string>Tor Browser Bundle TORBROWSER_VERSION Copyright 2014 The Tor Project</string>
 	<key>CFBundleIconFile</key>
 	<string>firefox.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.5.1</string>
+	<string>TORBROWSER_VERSION</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>LSEnvironment</key>
@@ -35,7 +35,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<false/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Tor Browser Bundle 3.5.1 Copyright 2014 The Tor Project</string>
+	<string>Tor Browser Bundle TORBROWSER_VERSION Copyright 2014 The Tor Project</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index 8810c0f..428dbee 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -104,6 +104,7 @@ script: |
   fi
   cd TorBrowserBundle.app
   unzip ~/build/mac-skeleton.zip
+  sed -i -e "s/TORBROWSER_VERSION/$TORBROWSER_VERSION/" Contents/Info.plist
   unzip ~/build/tbb-docs.zip
   if [ $BUILD_PT_BUNDLES ]; then
     cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults