diff options
Diffstat (limited to 'contrib/osx')
| -rw-r--r-- | contrib/osx/TorBundleInfo.plist.in | 22 | ||||
| -rw-r--r-- | contrib/osx/TorInfo.plist.in | 2 | ||||
| -rw-r--r-- | contrib/osx/TorStartupInfo.plist | 2 | ||||
| -rwxr-xr-x | contrib/osx/uninstall_tor_bundle.sh | 2 |
4 files changed, 5 insertions, 23 deletions
diff --git a/contrib/osx/TorBundleInfo.plist.in b/contrib/osx/TorBundleInfo.plist.in index 8a74239d36..61b4f8368b 100644 --- a/contrib/osx/TorBundleInfo.plist.in +++ b/contrib/osx/TorBundleInfo.plist.in @@ -7,8 +7,8 @@ <key>CFBundleGetInfoString</key> <string>Tor Bundle @VERSION@</string> <key>CFBundleIdentifier</key> - <string>org.torproject.torbundle</string> - <key>CFBundleSortVersionString</key> + <string>net.freehaven.torbundle</string> + <key>CFBundleShortVersionString</key> <string>@VERSION@</string> <key>IFPkgFlagComponentDirectory</key> <string>../.contained_packages</string> @@ -22,28 +22,10 @@ </dict> <dict> <key>IFPkgFlagPackageLocation</key> - <string>Privoxy.pkg</string> - <key>IFPkgFlagPackageSelection</key> - <string>selected</string> - </dict> - <dict> - <key>IFPkgFlagPackageLocation</key> - <string>privoxyconf.pkg</string> - <key>IFPkgFlagPackageSelection</key> - <string>selected</string> - </dict> - <dict> - <key>IFPkgFlagPackageLocation</key> <string>torstartup.pkg</string> <key>IFPkgFlagPackageSelection</key> <string>selected</string> </dict> - <dict> - <key>IFPkgFlagPackageLocation</key> - <string>torbutton.pkg</string> - <key>IFPkgFlagPackageSelection</key> - <string>selected</string> - </dict> </array> <key>IFPkgFormatVersion</key> <real>0.10000000149011612</real> 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 |