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

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

Issue 2755007: Move the remainder of the installer-related files to chrome/installer/mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 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 | « chrome/installer/mac/README.chromium ('k') | chrome/installer/mac/pkg-dmg » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/mac/keystone_install_test.sh
===================================================================
--- chrome/installer/mac/keystone_install_test.sh (revision 49538)
+++ chrome/installer/mac/keystone_install_test.sh (working copy)
@@ -94,10 +94,8 @@
function make_new_dest() {
DEST="${TEMPDIR}"/Dest.app
rm -rf "${DEST}"
- RSRCDIR="${DEST}/Contents/Versions/0/${FWKNAME}/Resources"
- mkdir -p "${RSRCDIR}"
defaults write "${DEST}/Contents/Info" CFBundleShortVersionString 0
- defaults write "${RSRCDIR}/Info" KSVersion 0
+ defaults write "${DEST}/Contents/Info" KSVersion 0
cat >"${TEMPDIR}"/ksadmin <<EOF
#!/bin/sh
if [ "\${1}" = "--ksadmin-version" ] ; then
@@ -122,9 +120,9 @@
mkdir -p "${RSRCDIR}"
defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" \
CFBundleShortVersionString "1"
- defaults write "${RSRCDIR}/Info" \
+ defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" \
KSProductID "com.google.Chrome"
- defaults write "${RSRCDIR}/Info" \
+ defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" \
KSVersion "2"
}
@@ -146,24 +144,18 @@
fail_installer "Was no KSUpdateURL in dest after copy"
make_basic_src_and_dest
-defaults write \
- "${TEMPDIR}/${APPNAME}/Contents/Versions/1/${FWKNAME}/Resources/Info" \
- KSUpdateURL "http://foo.bar"
+defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" KSUpdateURL "http://foobar"
export FAKE_SYSTEM_TICKET=1
fail_installer "User and system ticket both present"
export -n FAKE_SYSTEM_TICKET
make_src
make_old_dest
-defaults write \
- "${TEMPDIR}/${APPNAME}/Contents/Versions/1/${FWKNAME}/Resources/Info" \
- KSUpdateURL "http://foo.bar"
+defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" KSUpdateURL "http://foobar"
pass_installer "Old-style update"
make_basic_src_and_dest
-defaults write \
- "${TEMPDIR}/${APPNAME}/Contents/Versions/1/${FWKNAME}/Resources/Info" \
- KSUpdateURL "http://foo.bar"
+defaults write "${TEMPDIR}/${APPNAME}/Contents/Info" KSUpdateURL "http://foobar"
pass_installer "ALL"
cleanup_tempdir
« no previous file with comments | « chrome/installer/mac/README.chromium ('k') | chrome/installer/mac/pkg-dmg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698