diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 18:00:28 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 18:00:28 +0000 |
| commit | 345dfe88e49ca101e971f4d0571e08928a1dfa6a (patch) | |
| tree | 0507c5a7d4833cee3861564b8e579ff953b0ecf4 /remoting | |
| parent | e38d33c7ab07d2223c2635a4f1e27da6df9cd8d4 (diff) | |
| download | chromium_src-345dfe88e49ca101e971f4d0571e08928a1dfa6a.zip chromium_src-345dfe88e49ca101e971f4d0571e08928a1dfa6a.tar.gz chromium_src-345dfe88e49ca101e971f4d0571e08928a1dfa6a.tar.bz2 | |
[Chromoting] Update version check script to properly handle branding.
Old version assumed the installer was officially branded and didn't check
for the version of Chromoting Host Uninstaller. This version checks for
both versions and properly handles missing files.
Review URL: https://chromiumcodereview.appspot.com/10913205
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rwxr-xr-x | remoting/tools/get_mac_crd_version.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/remoting/tools/get_mac_crd_version.sh b/remoting/tools/get_mac_crd_version.sh index 806e09a..dbddb9c 100755 --- a/remoting/tools/get_mac_crd_version.sh +++ b/remoting/tools/get_mac_crd_version.sh @@ -5,7 +5,8 @@ # found in the LICENSE file. ME2ME_HOST="/Library/PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app" -UNINSTALLER="/Applications/Chrome Remote Desktop Host Uninstaller.app" +UNINSTALLER_CHROME="/Applications/Chrome Remote Desktop Host Uninstaller.app" +UNINSTALLER_CHROMIUM="/Applications/Chromoting Host Uninstaller.app" PREFPANE="/Library/PreferencePanes/org.chromium.chromoting.prefPane" KEYSTONE="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle" @@ -16,11 +17,16 @@ set -e -u function print_plist_version { local name="${1}" local file="${2}" - set `PlistBuddy -c 'Print CFBundleVersion' "${file}/${INFO_PLIST}"` - echo "${name} version = ${1}" + if [[ -e "${file}/${INFO_PLIST}" ]]; then + set `PlistBuddy -c 'Print CFBundleVersion' "${file}/${INFO_PLIST}"` + echo "${name}: version = ${1}" + else + echo "${name}: plist doesn't exist" + fi } print_plist_version "Me2me host" "${ME2ME_HOST}" -print_plist_version "Uninstaller" "${UNINSTALLER}" +print_plist_version "Chrome Remote Desktop Host Uninstaller" "${UNINSTALLER_CHROME}" +print_plist_version "Chromoting Host Uninstaller" "${UNINSTALLER_CHROMIUM}" print_plist_version "PreferencePane" "${PREFPANE}" print_plist_version "Keystone" "${KEYSTONE}" |