summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2008-12-02 23:47:27 +0000
committerAndrew Lewman <andrew@torproject.org>2008-12-02 23:47:27 +0000
commitb2321cfd2f89899e77f7df96197ce7016a037b13 (patch)
tree157995ad8e49985afd7f3e329d0412ddd5e904a1
parent96a185d9b79055de7fa2c9a6df4ca375d0308cb4 (diff)
downloadtor-b2321cfd2f89899e77f7df96197ce7016a037b13.tar.gz
tor-b2321cfd2f89899e77f7df96197ce7016a037b13.zip
It's Short not Sort. Fix path to package list.
svn:r17458
-rw-r--r--contrib/osx/TorBundleInfo.plist.in2
-rw-r--r--contrib/osx/TorInfo.plist.in2
-rw-r--r--contrib/osx/TorStartupInfo.plist2
-rwxr-xr-xcontrib/osx/uninstall_tor_bundle.sh2
4 files changed, 4 insertions, 4 deletions
diff --git a/contrib/osx/TorBundleInfo.plist.in b/contrib/osx/TorBundleInfo.plist.in
index b84ba253d7..61b4f8368b 100644
--- 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 1918a5e6bc..a5bc13f88b 100644
--- 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 838390dd8d..08d92742a6 100644
--- 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 b7d6427559..9089407edb 100755
--- 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