diff options
| author | petermayo@chromium.org <petermayo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-30 22:06:58 +0000 |
|---|---|---|
| committer | petermayo@chromium.org <petermayo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-30 22:06:58 +0000 |
| commit | dc0997778c0307c8d2924d8556c2aa979a250be5 (patch) | |
| tree | 9c8fcef12e2d588469ab1d45624a5debfc0139c1 /build | |
| parent | 84283f59d29b15d434540b53c3ed7e941f32fa27 (diff) | |
| download | chromium_src-dc0997778c0307c8d2924d8556c2aa979a250be5.zip chromium_src-dc0997778c0307c8d2924d8556c2aa979a250be5.tar.gz chromium_src-dc0997778c0307c8d2924d8556c2aa979a250be5.tar.bz2 | |
Make --no-prompt --lib32 install lib32 support.
BUG=297984,299075
TEST=local
Review URL: https://codereview.chromium.org/24961002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226060 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/install-build-deps.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index 81cb897..d9a7af2 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -158,7 +158,7 @@ else fi -# Some packages are only needed, if the distribution actually supports +# Some packages are only needed if the distribution actually supports # installing them. if package_exists appmenu-gtk; then lib_list="$lib_list appmenu-gtk" @@ -172,6 +172,7 @@ fi # Users can abort the function by pressing CTRL-C. This will call "exit 1". yes_no() { if [ 0 -ne "${do_default-0}" ] ; then + [ $1 -eq 0 ] && echo "Y" || echo "N" return $1 fi local c @@ -329,7 +330,9 @@ if [ "$(uname -m)" = "x86_64" ]; then # There are other ways to achieve the same goal. But resetting the # variable is the best way to document the intended behavior -- and to # allow us to gradually deprecate and then remove the obsolete code. - do_inst_lib32= + if test "${do_default-0}" -ne 1; then + do_inst_lib32= + fi fi echo "WARNING" @@ -342,10 +345,12 @@ if [ "$(uname -m)" = "x86_64" ]; then echo "The code for installing 32bit libraries on a 64bit system is" echo "unmaintained and might not work with modern versions of Ubuntu" echo "or Debian." - echo - echo -n "Are you sure you want to proceed (y/N) " - if yes_no 1; then - do_inst_lib32=1 + if test "$do_inst_lib32" != "" ; then + echo + echo -n "Are you sure you want to proceed (y/N) " + if yes_no 1; then + do_inst_lib32=1 + fi fi if test "$do_inst_lib32" != "1" then |