diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 19:03:47 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 19:03:47 +0000 |
| commit | 5eabe706ef13adac8c4530c3cf9dda41bfbe66c0 (patch) | |
| tree | 51acf22bfe4d6179f3f4b7c0f4c4b4080a415c5c /chrome/installer/mac | |
| parent | 0d1479b4011662615776f74a0611e9a77b9faa9a (diff) | |
| download | chromium_src-5eabe706ef13adac8c4530c3cf9dda41bfbe66c0.zip chromium_src-5eabe706ef13adac8c4530c3cf9dda41bfbe66c0.tar.gz chromium_src-5eabe706ef13adac8c4530c3cf9dda41bfbe66c0.tar.bz2 | |
bash 4.0 compatibility for .keystone_install. In bash 4.0, "declare VAR" no
longer initializes VAR if not already set.
BUG=83180
TEST=Run .keystone_install under bash 4.0 or newer (4.2.10 is current)
Review URL: http://codereview.chromium.org/7050012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mac')
| -rwxr-xr-x | chrome/installer/mac/keystone_install.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/installer/mac/keystone_install.sh b/chrome/installer/mac/keystone_install.sh index d8ce6c1..d5db8fd 100755 --- a/chrome/installer/mac/keystone_install.sh +++ b/chrome/installer/mac/keystone_install.sh @@ -61,7 +61,9 @@ shopt -s nullglob ME="$(basename "${0}")" readonly ME -declare GOOGLE_CHROME_UPDATER_DEBUG +# Workaround for http://code.google.com/p/chromium/issues/detail?id=83180#c3 +# In bash 4.0, "declare VAR" no longer initializes VAR if not already set. +GOOGLE_CHROME_UPDATER_DEBUG="${GOOGLE_CHROME_UPDATER_DEBUG:-}" err() { local error="${1}" @@ -81,7 +83,7 @@ note() { fi } -declare g_temp_dir +g_temp_dir= cleanup() { local status=${?} |