diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 19:03:51 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 19:03:51 +0000 |
| commit | fd6abfcc19df4aceb9badaba5eecc2022b4b2d2f (patch) | |
| tree | cc0a6ac117e7d3f7e020b6105e116d4df0a79ae0 /chrome/installer | |
| parent | 5eabe706ef13adac8c4530c3cf9dda41bfbe66c0 (diff) | |
| download | chromium_src-fd6abfcc19df4aceb9badaba5eecc2022b4b2d2f.zip chromium_src-fd6abfcc19df4aceb9badaba5eecc2022b4b2d2f.tar.gz chromium_src-fd6abfcc19df4aceb9badaba5eecc2022b4b2d2f.tar.bz2 | |
bash 4.0 compatibility for dirdiffer.sh. In bash 4.0, "declare VAR" no longer
initializes VAR if not already set.
BUG=83180
TEST=Run dirdiffer.sh under bash 4.0 or newer (4.2.10 is current)
Review URL: http://codereview.chromium.org/7050013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rwxr-xr-x | chrome/installer/mac/dirdiffer.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/installer/mac/dirdiffer.sh b/chrome/installer/mac/dirdiffer.sh index 6c9b3d1..d3a8f9b 100755 --- a/chrome/installer/mac/dirdiffer.sh +++ b/chrome/installer/mac/dirdiffer.sh @@ -158,8 +158,10 @@ readonly GZ_SUFFIX='$gz' readonly XZ_SUFFIX='$xz' readonly PLAIN_SUFFIX='$raw' -declare DIRDIFFER_EXCLUDE -declare DIRDIFFER_NO_DIFF +# 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. +DIRDIFFER_EXCLUDE="${DIRDIFFER_EXCLUDE:-}" +DIRDIFFER_NO_DIFF="${DIRDIFFER_NO_DIFF:-}" err() { local error="${1}" @@ -493,7 +495,7 @@ main() { # invalid regular expression. if [[ -n "${DIRDIFFER_EXCLUDE}" ]]; then - if [[ "" =~ ${DIRDIFFER_EXCLUDE} ]] ; then + if [[ "" =~ ${DIRDIFFER_EXCLUDE} ]]; then true elif [[ ${?} -eq 2 ]]; then err "DIRDIFFER_EXCLUDE contains an invalid regular expression" @@ -502,7 +504,7 @@ main() { fi if [[ -n "${DIRDIFFER_NO_DIFF}" ]]; then - if [[ "" =~ ${DIRDIFFER_NO_DIFF} ]] ; then + if [[ "" =~ ${DIRDIFFER_NO_DIFF} ]]; then true elif [[ ${?} -eq 2 ]]; then err "DIRDIFFER_NO_DIFF contains an invalid regular expression" |