It's Short not Sort. Fix path to package list.

svn:r17458

diff --git a/contrib/osx/TorBundleInfo.plist.in b/contrib/osx/TorBundleInfo.plist.in
index b84ba253d7436776529e8de1628c11c49314145f..61b4f8368bf45cdf0c59e8ce0bfb85c4b0a5b037 100644 (file)
--- a/contrib/osx/TorBundleInfo.plist.in
+++ b/contrib/osx/TorBundleInfo.plist.in
@@ -8,7 +8,7 @@
        <string>Tor Bundle @VERSION@</string>
        <key>CFBundleIdentifier</key>
        <string>net.freehaven.torbundle</string>
-       <key>CFBundleSortVersionString</key>
+       <key>CFBundleShortVersionString</key>
        <string>@VERSION@</string>
        <key>IFPkgFlagComponentDirectory</key>
        <string>../.contained_packages</string>

diff --git a/contrib/osx/TorInfo.plist.in b/contrib/osx/TorInfo.plist.in
index 1918a5e6bcadf3f79459071834519b69bd0d7388..a5bc13f88b9e00746e77d8f94a74604fae5bc52a 100644 (file)
--- a/contrib/osx/TorInfo.plist.in
+++ b/contrib/osx/TorInfo.plist.in
@@ -8,7 +8,7 @@
        <string>Tor @VERSION@</string>
        <key>CFBundleName</key>
        <string>Tor</string>
-       <key>CFBundleSortVersionString</key>
+       <key>CFBundleShortVersionString</key>
        <string>@VERSION@</string>
        <key>IFPkgFlagAllowBackRev</key>
        <true/>

diff --git a/contrib/osx/TorStartupInfo.plist b/contrib/osx/TorStartupInfo.plist
index 838390dd8dec886c56fbfdab5e9251c2dfb1411f..08d92742a6903550a5f5d5c95c2988fd51edc3de 100644 (file)
--- a/contrib/osx/TorStartupInfo.plist
+++ b/contrib/osx/TorStartupInfo.plist
@@ -8,7 +8,7 @@
        <string>Tor Startup Script</string>
        <key>CFBundleName</key>
        <string>Tor Startup Script</string>
-       <key>CFBundleSortVersionString</key>
+       <key>CFBundleShortVersionString</key>
        <string>0.1</string>
        <key>IFPkgFlagAllowBackRev</key>
        <true/>

diff --git a/contrib/osx/uninstall_tor_bundle.sh b/contrib/osx/uninstall_tor_bundle.sh
index b7d6427559409ed3845e918cef654b1ecd22841e..9089407edb37d68a74c6b8499f6d4b95c6c577c5 100755 (executable)
--- a/contrib/osx/uninstall_tor_bundle.sh
+++ b/contrib/osx/uninstall_tor_bundle.sh
@@ -31,7 +31,7 @@
 
 ### this is the location of a file which contains all the actual package names
 ##     (ie "Tor", "torstartup", ...) the list should be new-line-delimited.
-PACKAGE_LIST_SRC=./package_list.txt
+PACKAGE_LIST_SRC=/Library/Tor/package_list.txt
 
 ### this is the name of the user created in the install process of Tor
 TOR_USER=_tor