winlin

fix ubuntu build bug, add --force-yes to install

@@ -40,56 +40,56 @@ function Ubuntu_prepare() @@ -40,56 +40,56 @@ function Ubuntu_prepare()
40 40
41 gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 41 gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
42 echo "install gcc" 42 echo "install gcc"
43 - require_sudoer "sudo apt-get install -y gcc" 43 + require_sudoer "sudo apt-get install -y --force-yes gcc"
44 sudo apt-get install -y gcc 44 sudo apt-get install -y gcc
45 echo "install gcc success" 45 echo "install gcc success"
46 fi 46 fi
47 47
48 g++ --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 48 g++ --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
49 echo "install g++" 49 echo "install g++"
50 - require_sudoer "sudo apt-get install -y g++" 50 + require_sudoer "sudo apt-get install -y --force-yes g++"
51 sudo apt-get install -y g++ 51 sudo apt-get install -y g++
52 echo "install g++ success" 52 echo "install g++ success"
53 fi 53 fi
54 54
55 make --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 55 make --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
56 echo "install make" 56 echo "install make"
57 - require_sudoer "sudo apt-get install -y make" 57 + require_sudoer "sudo apt-get install -y --force-yes make"
58 sudo apt-get install -y make 58 sudo apt-get install -y make
59 echo "install make success" 59 echo "install make success"
60 fi 60 fi
61 61
62 autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 62 autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
63 echo "install autoconf" 63 echo "install autoconf"
64 - require_sudoer "sudo apt-get install -y autoconf" 64 + require_sudoer "sudo apt-get install -y --force-yes autoconf"
65 sudo apt-get install -y autoconf 65 sudo apt-get install -y autoconf
66 echo "install autoconf success" 66 echo "install autoconf success"
67 fi 67 fi
68 68
69 libtool --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 69 libtool --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
70 echo "install libtool" 70 echo "install libtool"
71 - require_sudoer "sudo apt-get install -y libtool" 71 + require_sudoer "sudo apt-get install -y --force-yes libtool"
72 sudo apt-get install -y libtool 72 sudo apt-get install -y libtool
73 echo "install libtool success" 73 echo "install libtool success"
74 fi 74 fi
75 75
76 if [[ ! -f /usr/include/pcre.h ]]; then 76 if [[ ! -f /usr/include/pcre.h ]]; then
77 echo "install libpcre3-dev" 77 echo "install libpcre3-dev"
78 - require_sudoer "sudo apt-get install -y libpcre3-dev" 78 + require_sudoer "sudo apt-get install -y --force-yes libpcre3-dev"
79 sudo apt-get install -y libpcre3-dev 79 sudo apt-get install -y libpcre3-dev
80 echo "install libpcre3-dev success" 80 echo "install libpcre3-dev success"
81 fi 81 fi
82 82
83 if [[ ! -f /usr/include/zlib.h ]]; then 83 if [[ ! -f /usr/include/zlib.h ]]; then
84 echo "install zlib1g-dev" 84 echo "install zlib1g-dev"
85 - require_sudoer "sudo apt-get install -y zlib1g-dev" 85 + require_sudoer "sudo apt-get install -y --force-yes zlib1g-dev"
86 sudo apt-get install -y zlib1g-dev 86 sudo apt-get install -y zlib1g-dev
87 echo "install zlib1g-dev success" 87 echo "install zlib1g-dev success"
88 fi 88 fi
89 89
90 if [[ ! -d /usr/include/freetype2 ]]; then 90 if [[ ! -d /usr/include/freetype2 ]]; then
91 echo "install libfreetype6-dev" 91 echo "install libfreetype6-dev"
92 - require_sudoer "sudo apt-get install -y libfreetype6-dev" 92 + require_sudoer "sudo apt-get install -y --force-yes libfreetype6-dev"
93 sudo apt-get install -y libfreetype6-dev 93 sudo apt-get install -y libfreetype6-dev
94 echo "install libfreetype6-dev success" 94 echo "install libfreetype6-dev success"
95 fi 95 fi