Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5683)

Unified Diff: chrome/installer/mac/keystone_install.sh

Issue 7029034: Use --version-path and --version-key when available, in Keystone 1.0.9.2318 and later (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mac/keystone_install.sh
===================================================================
--- chrome/installer/mac/keystone_install.sh (revision 85774)
+++ chrome/installer/mac/keystone_install.sh (working copy)
@@ -377,6 +377,15 @@
# return value.
}
+# Returns 0 (true) if ksadmin supports --version-path and --version-key.
TVL 2011/05/18 17:57:31 for some reason I thought this had been around a l
Mark Mentovai 2011/05/18 18:10:42 TVL wrote:
+ksadmin_supports_versionpath_versionkey() {
+ # --version-path and --version-key were introduced in Keystone 1.0.9.2318.
+ is_ksadmin_version_ge 1.0.9.2318
+
+ # The return value of is_ksadmin_version_ge is used as this function's
+ # return value.
+}
+
usage() {
echo "usage: ${ME} update_dmg_mount_point" >& 2
}
@@ -1074,6 +1083,13 @@
)
fi
+ if ksadmin_supports_versionpath_versionkey; then
+ ksadmin_args+=(
+ --version-path "${installed_app_plist_path}"
TVL 2011/05/18 17:57:31 so my fear here is user installs where they drag i
Mark Mentovai 2011/05/18 18:10:42 TVL wrote:
+ --version-key "${KS_VERSION_KEY}"
+ )
+ fi
+
note "ksadmin_args = ${ksadmin_args[*]}"
if ! ksadmin "${ksadmin_args[@]}"; then
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698