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

Unified Diff: build/install-build-deps.sh

Issue 24961002: Make --no-prompt --lib32 install lib32 support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 3 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: build/install-build-deps.sh
===================================================================
--- build/install-build-deps.sh (revision 225634)
+++ build/install-build-deps.sh (working copy)
@@ -158,7 +158,7 @@
fi
-# Some packages are only needed, if the distribution actually supports
+# Some packages are only needed if the distribution actually supports
Peter Mayo 2013/09/27 04:48:46 This is just a little readability tweak.
# installing them.
if package_exists appmenu-gtk; then
lib_list="$lib_list appmenu-gtk"
@@ -172,6 +172,7 @@
# 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"
Peter Mayo 2013/09/27 04:48:46 Prompt messages in a log that are unclear how they
return $1
fi
local c
@@ -329,7 +330,9 @@
# 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 @@
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
« 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