Browse Source

Quieter install

Bob Mottram 8 years ago
parent
commit
061e65520d
60 changed files with 228 additions and 224 deletions
  1. 2
    0
      src/freedombone
  2. 1
    1
      src/freedombone-addcert
  3. 3
    3
      src/freedombone-app-batman
  4. 2
    2
      src/freedombone-app-dlna
  5. 3
    3
      src/freedombone-app-dokuwiki
  6. 2
    2
      src/freedombone-app-emacs
  7. 4
    4
      src/freedombone-app-gnusocial
  8. 2
    2
      src/freedombone-app-gogs
  9. 1
    1
      src/freedombone-app-htmly
  10. 3
    3
      src/freedombone-app-hubzilla
  11. 8
    8
      src/freedombone-app-ipfs
  12. 4
    4
      src/freedombone-app-irc
  13. 14
    14
      src/freedombone-app-librevault
  14. 9
    9
      src/freedombone-app-mediagoblin
  15. 2
    2
      src/freedombone-app-mumble
  16. 2
    2
      src/freedombone-app-pelican
  17. 2
    2
      src/freedombone-app-pihole
  18. 2
    2
      src/freedombone-app-rss
  19. 2
    2
      src/freedombone-app-searx
  20. 4
    4
      src/freedombone-app-sip
  21. 3
    3
      src/freedombone-app-syncthing
  22. 3
    3
      src/freedombone-app-tahoelafs
  23. 16
    16
      src/freedombone-app-tox
  24. 2
    2
      src/freedombone-app-vim
  25. 2
    2
      src/freedombone-app-vpn
  26. 3
    3
      src/freedombone-app-webmail
  27. 5
    5
      src/freedombone-app-xmpp
  28. 2
    2
      src/freedombone-app-zeronet
  29. 13
    13
      src/freedombone-base-email
  30. 3
    3
      src/freedombone-base-tripwire
  31. 4
    4
      src/freedombone-client
  32. 2
    2
      src/freedombone-config
  33. 4
    4
      src/freedombone-image
  34. 19
    19
      src/freedombone-image-customise
  35. 4
    4
      src/freedombone-mesh
  36. 6
    6
      src/freedombone-mesh-install
  37. 1
    1
      src/freedombone-recoverkey
  38. 1
    1
      src/freedombone-utils-avahi
  39. 1
    1
      src/freedombone-utils-backup
  40. 2
    2
      src/freedombone-utils-cmake
  41. 2
    2
      src/freedombone-utils-cryptopp
  42. 7
    7
      src/freedombone-utils-database
  43. 3
    3
      src/freedombone-utils-ffmpeg
  44. 2
    2
      src/freedombone-utils-filesystem
  45. 2
    0
      src/freedombone-utils-final
  46. 3
    3
      src/freedombone-utils-go
  47. 1
    1
      src/freedombone-utils-international
  48. 1
    1
      src/freedombone-utils-monkeysphere
  49. 4
    4
      src/freedombone-utils-nodejs
  50. 3
    3
      src/freedombone-utils-onion
  51. 1
    1
      src/freedombone-utils-passwords
  52. 2
    2
      src/freedombone-utils-repos
  53. 4
    4
      src/freedombone-utils-rng
  54. 13
    13
      src/freedombone-utils-setup
  55. 1
    1
      src/freedombone-utils-ssh
  56. 1
    1
      src/freedombone-utils-time
  57. 2
    2
      src/freedombone-utils-tracker
  58. 1
    1
      src/freedombone-utils-upgrade
  59. 6
    6
      src/freedombone-utils-web
  60. 1
    1
      src/freedombone-utils-wifi

+ 2
- 0
src/freedombone View File

@@ -311,6 +311,8 @@ echo ''
311 311
 echo $'Setting up the base installation'
312 312
 echo ''
313 313
 
314
+export DEBIAN_FRONTEND=noninteractive
315
+
314 316
 upgrade_installation_from_previous_versions
315 317
 setup_utils
316 318
 setup_email

+ 1
- 1
src/freedombone-addcert View File

@@ -196,7 +196,7 @@ function add_cert_letsencrypt {
196 196
     fi
197 197
 
198 198
     if [ ! -f /usr/bin/certbot ]; then
199
-        apt-get -y install certbot -t jessie-backports
199
+        apt-get -yq install certbot -t jessie-backports
200 200
         if [ ! -f /usr/bin/certbot ]; then
201 201
             echo $'LetsEncrypt certbot failed to install'
202 202
             exit 762830

+ 3
- 3
src/freedombone-app-batman View File

@@ -93,9 +93,9 @@ function remove_batman {
93 93
 }
94 94
 
95 95
 function mesh_install_batman {
96
-    chroot "$rootdir" apt-get -y install iproute bridge-utils libnetfilter-conntrack3 batctl
97
-    chroot "$rootdir" apt-get -y install python-dev libevent-dev ebtables python-pip git
98
-    chroot "$rootdir" apt-get -y install wireless-tools rfkill
96
+    chroot "$rootdir" apt-get -yq install iproute bridge-utils libnetfilter-conntrack3 batctl
97
+    chroot "$rootdir" apt-get -yq install python-dev libevent-dev ebtables python-pip git
98
+    chroot "$rootdir" apt-get -yq install wireless-tools rfkill
99 99
 
100 100
     if ! grep -q "batman_adv" $rootdir/etc/modules; then
101 101
         echo 'batman_adv' >> $rootdir/etc/modules

+ 2
- 2
src/freedombone-app-dlna View File

@@ -154,7 +154,7 @@ function restore_remote_dlna {
154 154
 
155 155
 function remove_dlna {
156 156
     service minidlna stop
157
-    apt-get -y remove --purge minidlna
157
+    apt-get -yq remove --purge minidlna
158 158
     if [ -f /etc/minidlna.conf ]; then
159 159
         rm /etc/minidlna.conf
160 160
     fi
@@ -168,7 +168,7 @@ function install_dlna_main {
168 168
         return
169 169
     fi
170 170
 
171
-    apt-get -y install minidlna
171
+    apt-get -yq install minidlna
172 172
 
173 173
     if [ ! -f /etc/minidlna.conf ]; then
174 174
         echo $"ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE"

+ 3
- 3
src/freedombone-app-dokuwiki View File

@@ -177,7 +177,7 @@ function remove_dokuwiki {
177 177
     if [ -f /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME ]; then
178 178
         rm /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
179 179
     fi
180
-    apt-get -y remove --purge dokuwiki
180
+    apt-get -yq remove --purge dokuwiki
181 181
     if [ ! -d /var/www/$DOKUWIKI_DOMAIN_NAME ]; then
182 182
         rm -rf /var/www/$DOKUWIKI_DOMAIN_NAME
183 183
     fi
@@ -206,8 +206,8 @@ function install_dokuwiki {
206 206
     if [ ! $DOKUWIKI_DOMAIN_NAME ]; then
207 207
         return
208 208
     fi
209
-    apt-get -y install dokuwiki
210
-    apt-get -y remove --purge apache*
209
+    apt-get -yq install dokuwiki
210
+    apt-get -yq remove --purge apache*
211 211
     if [ -d /etc/apache2 ]; then
212 212
         rm -rf /etc/apache2
213 213
         echo $'Removed Apache installation after Dokuwiki install'

+ 2
- 2
src/freedombone-app-emacs View File

@@ -136,7 +136,7 @@ function restore_remote_emacs {
136 136
 }
137 137
 
138 138
 function remove_emacs {
139
-    apt-get -y remove --purge emacs24
139
+    apt-get -yq remove --purge emacs24
140 140
     update-alternatives --set editor /usr/bin/nano
141 141
     sed -i '/install_emacs/d' $COMPLETION_FILE
142 142
 
@@ -159,7 +159,7 @@ function remove_emacs {
159 159
 }
160 160
 
161 161
 function install_emacs {
162
-    apt-get -y install emacs24
162
+    apt-get -yq install emacs24
163 163
     update-alternatives --set editor /usr/bin/emacs24
164 164
 
165 165
     # A minimal emacs configuration

+ 4
- 4
src/freedombone-app-gnusocial View File

@@ -510,8 +510,8 @@ function install_gnusocial_main {
510 510
     function_check repair_databases_script
511 511
     repair_databases_script
512 512
 
513
-    apt-get -y install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
514
-    apt-get -y install php5-memcached php5-intl
513
+    apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
514
+    apt-get -yq install php5-memcached php5-intl
515 515
 
516 516
     if [ ! -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then
517 517
         mkdir /var/www/$GNUSOCIAL_DOMAIN_NAME
@@ -764,7 +764,7 @@ function install_gnusocial_plugin_sharings {
764 764
         exit 72945
765 765
     fi
766 766
 
767
-    apt-get -y install liblocale-msgfmt-perl gettext
767
+    apt-get -yq install liblocale-msgfmt-perl gettext
768 768
 
769 769
     # update to the next commit
770 770
     function_check set_repo_commit
@@ -937,7 +937,7 @@ function install_gnusocial_theme {
937 937
         return
938 938
     fi
939 939
 
940
-    apt-get -y install wget
940
+    apt-get -yq install wget
941 941
 
942 942
     if [ ! -d /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/local/plugins ]; then
943 943
         mkdir -p /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/local/plugins

+ 2
- 2
src/freedombone-app-gogs View File

@@ -158,7 +158,7 @@ function upgrade_gogs {
158 158
         if [ ! -f ${GOGS_FILE} ]; then
159 159
             exit 37836
160 160
         else
161
-            apt-get -y install unzip
161
+            apt-get -yq install unzip
162 162
             unzip -o ${GOGS_FILE}
163 163
         fi
164 164
     else
@@ -380,7 +380,7 @@ function install_gogs {
380 380
         if [ ! -f ${GOGS_FILE} ]; then
381 381
             exit 37836
382 382
         else
383
-            apt-get -y install unzip
383
+            apt-get -yq install unzip
384 384
             unzip -o ${GOGS_FILE}
385 385
         fi
386 386
     else

+ 1
- 1
src/freedombone-app-htmly View File

@@ -598,7 +598,7 @@ function install_htmly {
598 598
     fi
599 599
 
600 600
     # for the avatar changing command
601
-    apt-get -y install imagemagick
601
+    apt-get -yq install imagemagick
602 602
 
603 603
     function_check install_htmly_from_repo
604 604
     install_htmly_from_repo

+ 3
- 3
src/freedombone-app-hubzilla View File

@@ -313,9 +313,9 @@ function install_hubzilla {
313 313
     function_check repair_databases_script
314 314
     repair_databases_script
315 315
 
316
-    apt-get -y install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git
317
-    apt-get -y install php5-dev imagemagick php5-imagick
318
-    apt-get -y install php5-memcached
316
+    apt-get -yq install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git
317
+    apt-get -yq install php5-dev imagemagick php5-imagick
318
+    apt-get -yq install php5-memcached
319 319
 
320 320
     if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then
321 321
         mkdir /var/www/$HUBZILLA_DOMAIN_NAME

+ 8
- 8
src/freedombone-app-ipfs View File

@@ -207,9 +207,9 @@ function mesh_install_ipfs_js {
207 207
         return
208 208
     fi
209 209
 
210
-    chroot ${rootdir} apt-get -y install nodejs
211
-    chroot ${rootdir} apt-get -y install npm curl
212
-    chroot ${rootdir} apt-get -y install libpam0g-dev fuse
210
+    chroot ${rootdir} apt-get -yq install nodejs
211
+    chroot ${rootdir} apt-get -yq install npm curl
212
+    chroot ${rootdir} apt-get -yq install libpam0g-dev fuse
213 213
 
214 214
     if [ ! -f ${rootdir}/usr/bin/nodejs ]; then
215 215
         echo $'nodejs was not installed'
@@ -287,9 +287,9 @@ function install_ipfs_js {
287 287
         return
288 288
     fi
289 289
 
290
-    apt-get -y install nodejs
291
-    apt-get -y install npm
292
-    apt-get -y install libpam0g-dev fuse
290
+    apt-get -yq install nodejs
291
+    apt-get -yq install npm
292
+    apt-get -yq install libpam0g-dev fuse
293 293
 
294 294
     if [ ! -f /usr/bin/nodejs ]; then
295 295
         echo $'nodejs was not installed'
@@ -377,7 +377,7 @@ function install_ipfs_js {
377 377
 }
378 378
 
379 379
 function mesh_install_ipfs_go {
380
-    chroot ${rootdir} apt-get -y install libpam0g-dev fuse wget
380
+    chroot ${rootdir} apt-get -yq install libpam0g-dev fuse wget
381 381
 
382 382
     mesh_upgrade_golang
383 383
 
@@ -454,7 +454,7 @@ function install_ipfs_go {
454 454
         return
455 455
     fi
456 456
 
457
-    apt-get -y install golang libpam0g-dev fuse
457
+    apt-get -yq install golang libpam0g-dev fuse
458 458
 
459 459
     if [ ! -d /home/git ]; then
460 460
         # add a gogs user account

+ 4
- 4
src/freedombone-app-irc View File

@@ -239,8 +239,8 @@ function restore_remote_irc {
239 239
 function remove_irc {
240 240
     remove_watchdog_daemon ngircd
241 241
     systemctl stop ngircd
242
-    apt-get -y remove --purge ngircd
243
-    apt-get -y remove --purge irssi
242
+    apt-get -yq remove --purge ngircd
243
+    apt-get -yq remove --purge irssi
244 244
     if [ -d /etc/ngircd ]; then
245 245
         rm -rf /etc/ngircd
246 246
     fi
@@ -283,7 +283,7 @@ function install_irc_server {
283 283
     if [[ $(app_is_installed irc_server) == "1" ]]; then
284 284
         return
285 285
     fi
286
-    apt-get -y install ngircd
286
+    apt-get -yq install ngircd
287 287
 
288 288
     if [ ! -d /etc/ngircd ]; then
289 289
         echo $"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE"
@@ -383,7 +383,7 @@ function install_irc_client {
383 383
     if [[ $(app_is_installed irc_client) == "1" ]]; then
384 384
         return
385 385
     fi
386
-    apt-get -y install irssi
386
+    apt-get -yq install irssi
387 387
 
388 388
     if [ ! -d /home/${MY_USERNAME}/.irssi ]; then
389 389
         mkdir /home/${MY_USERNAME}/.irssi

+ 14
- 14
src/freedombone-app-librevault View File

@@ -130,18 +130,18 @@ function mesh_install_librevault {
130 130
     install_cmake
131 131
     install_cryptopp
132 132
 
133
-    chroot "$rootdir" apt-get -y install bittornado nginx
134
-    chroot "$rootdir" apt-get -y install build-essential
135
-    chroot "$rootdir" apt-get -y install autoconf automake libtool curl make unzip
133
+    chroot "$rootdir" apt-get -yq install bittornado nginx
134
+    chroot "$rootdir" apt-get -yq install build-essential
135
+    chroot "$rootdir" apt-get -yq install autoconf automake libtool curl make unzip
136 136
 
137 137
     # A workaround which allows c++14 to be installed
138 138
     sed -i 's|jessie|stretch|g' $rootdir/etc/apt/sources.list
139 139
     sed -i 's|stretch-backports|jessie-backports|g' $rootdir/etc/apt/sources.list
140 140
     chroot "$rootdir" apt-get update
141
-    chroot "$rootdir" apt-get -y install g++ gcc-6 g++-6 libboost-all-dev libssl-dev
142
-    chroot "$rootdir" apt-get -y install protobuf-compiler libprotobuf-dev
143
-    chroot "$rootdir" apt-get -y install qtbase5-dev libqt5svg5-dev libqt5websockets5-dev
144
-    chroot "$rootdir" apt-get -y install libsqlite3-dev qttools5-dev qttools5-dev-tools libnatpmp-dev
141
+    chroot "$rootdir" apt-get -yq install g++ gcc-6 g++-6 libboost-all-dev libssl-dev
142
+    chroot "$rootdir" apt-get -yq install protobuf-compiler libprotobuf-dev
143
+    chroot "$rootdir" apt-get -yq install qtbase5-dev libqt5svg5-dev libqt5websockets5-dev
144
+    chroot "$rootdir" apt-get -yq install libsqlite3-dev qttools5-dev qttools5-dev-tools libnatpmp-dev
145 145
     sed -i 's|stretch|jessie|g' $rootdir/etc/apt/sources.list
146 146
     chroot "$rootdir" apt-get update
147 147
 
@@ -229,18 +229,18 @@ function install_librevault {
229 229
     install_cmake
230 230
     install_cryptopp
231 231
 
232
-    apt-get -y install build-essential
233
-    apt-get -y install autoconf automake libtool curl make unzip
232
+    apt-get -yq install build-essential
233
+    apt-get -yq install autoconf automake libtool curl make unzip
234 234
 
235 235
     # A workaround which allows c++14 to be installed
236 236
     sed -i 's|jessie|stretch|g' /etc/apt/sources.list
237 237
     sed -i 's|stretch-backports|jessie-backports|g' /etc/apt/sources.list
238 238
     apt-get update
239
-    apt-get -y install protobuf-compiler libprotobuf-dev
240
-    apt-get -y install g++ gcc-6 g++-6 libboost-all-dev libssl-dev
241
-    apt-get -y install qtbase5-dev libqt5svg5-dev libqt5websockets5-dev
242
-    apt-get -y install libsqlite3-dev qttools5-dev qttools5-dev-tools libnatpmp-dev
243
-    apt-get -y install gcc-6 g++-6 libboost-all-dev
239
+    apt-get -yq install protobuf-compiler libprotobuf-dev
240
+    apt-get -yq install g++ gcc-6 g++-6 libboost-all-dev libssl-dev
241
+    apt-get -yq install qtbase5-dev libqt5svg5-dev libqt5websockets5-dev
242
+    apt-get -yq install libsqlite3-dev qttools5-dev qttools5-dev-tools libnatpmp-dev
243
+    apt-get -yq install gcc-6 g++-6 libboost-all-dev
244 244
     sed -i 's|stretch|jessie|g' /etc/apt/sources.list
245 245
     apt-get update
246 246
 

+ 9
- 9
src/freedombone-app-mediagoblin View File

@@ -187,15 +187,15 @@ function install_mediagoblin {
187 187
         chown -hR mediagoblin:www-data $MEDIAGOBLIN_WORKING_DIRECTORY
188 188
     fi
189 189
 
190
-    apt-get -y install git-core python python-dev python-lxml python-pil
191
-    apt-get -y install python-virtualenv npm nodejs-legacy automake
192
-    apt-get -y install fcgiwrap
193
-
194
-    #apt-get -y install postgresql postgresql-client python-psycopg2
195
-    #apt-get -y install python-gst-1.0 libjpeg62-turbo-dev gstreamer1.0-plugins-base python-gobject
196
-    #apt-get -y install gstreamer1.0-plugins-good gstreamer1.0-libav libav-tools gstreamer0.10-tools
197
-    #apt-get -y install python-numpy python-scipy libsndfile1-dev python-gst0.10-dev
198
-    #apt-get -y install gstreamer0.10-plugins-base gstreamer0.10-plugins-good gstreamer1.0-tools
190
+    apt-get -yq install git-core python python-dev python-lxml python-pil
191
+    apt-get -yq install python-virtualenv npm nodejs-legacy automake
192
+    apt-get -yq install fcgiwrap
193
+
194
+    #apt-get -yq install postgresql postgresql-client python-psycopg2
195
+    #apt-get -yq install python-gst-1.0 libjpeg62-turbo-dev gstreamer1.0-plugins-base python-gobject
196
+    #apt-get -yq install gstreamer1.0-plugins-good gstreamer1.0-libav libav-tools gstreamer0.10-tools
197
+    #apt-get -yq install python-numpy python-scipy libsndfile1-dev python-gst0.10-dev
198
+    #apt-get -yq install gstreamer0.10-plugins-base gstreamer0.10-plugins-good gstreamer1.0-tools
199 199
     #su -c "createuser -A -D mediagoblin" - postgres
200 200
     #su -c "createdb -E UNICODE -O mediagoblin mediagoblin" - postgres
201 201
 

+ 2
- 2
src/freedombone-app-mumble View File

@@ -156,7 +156,7 @@ function restore_remote_mumble {
156 156
 }
157 157
 
158 158
 function remove_mumble {
159
-    apt-get -y remove --purge mumble-server
159
+    apt-get -yq remove --purge mumble-server
160 160
     if [[ $ONION_ONLY == "no" ]]; then
161 161
         firewall_remove ${MUMBLE_PORT}
162 162
     fi
@@ -191,7 +191,7 @@ function configure_firewall_for_mumble {
191 191
 }
192 192
 
193 193
 function install_mumble {
194
-    apt-get -y install mumble-server
194
+    apt-get -yq install mumble-server
195 195
 
196 196
     function_check get_mumble_server_password
197 197
     get_mumble_server_password

+ 2
- 2
src/freedombone-app-pelican View File

@@ -274,7 +274,7 @@ function mesh_install_pelican {
274 274
         return
275 275
     fi
276 276
 
277
-    chroot "$rootdir" apt-get -y install python-pip
277
+    chroot "$rootdir" apt-get -yq install python-pip
278 278
     chroot "$rootdir" pip install ipython
279 279
     chroot "$rootdir" pip install Markdown
280 280
     chroot "$rootdir" pip install typogrify
@@ -315,7 +315,7 @@ function install_pelican {
315 315
         return
316 316
     fi
317 317
 
318
-    apt-get -y install python-pip
318
+    apt-get -yq install python-pip
319 319
     pip install ipython
320 320
     pip install Markdown
321 321
     pip install typogrify

+ 2
- 2
src/freedombone-app-pihole View File

@@ -288,7 +288,7 @@ function restore_remote_pihole {
288 288
 }
289 289
 
290 290
 function remove_pihole {
291
-    apt-get -y remove --purge dnsmasq
291
+    apt-get -yq remove --purge dnsmasq
292 292
 
293 293
     if [ ! -d /var/www/pihole ]; then
294 294
         rm -rf /var/www/pihole
@@ -323,7 +323,7 @@ function remove_pihole {
323 323
 }
324 324
 
325 325
 function install_pihole {
326
-    apt-get -y install dnsmasq curl
326
+    apt-get -yq install dnsmasq curl
327 327
     adduser --disabled-login --gecos 'pi-hole' pihole
328 328
     usermod -a -G www-data pihole
329 329
 

+ 2
- 2
src/freedombone-app-rss View File

@@ -287,8 +287,8 @@ function rss_modifications {
287 287
 }
288 288
 
289 289
 function install_rss_main {
290
-    apt-get -y install php-gettext php5-curl php5-gd php5-mysql git
291
-    apt-get -y install curl php-xml-parser php5-mcrypt
290
+    apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git
291
+    apt-get -yq install curl php-xml-parser php5-mcrypt
292 292
 
293 293
     if [ ! -d /etc/share ]; then
294 294
         mkdir /etc/share

+ 2
- 2
src/freedombone-app-searx View File

@@ -123,8 +123,8 @@ function install_searx {
123 123
         exit 62429
124 124
     fi
125 125
 
126
-    apt-get -y install python-pip libyaml-dev python-werkzeug python-babel python-lxml apache2-utils
127
-    apt-get -y install git build-essential libxslt-dev python-dev python-virtualenv python-pybabel zlib1g-dev uwsgi uwsgi-plugin-python libapache2-mod-uwsgi
126
+    apt-get -yq install python-pip libyaml-dev python-werkzeug python-babel python-lxml apache2-utils
127
+    apt-get -yq install git build-essential libxslt-dev python-dev python-virtualenv python-pybabel zlib1g-dev uwsgi uwsgi-plugin-python libapache2-mod-uwsgi
128 128
 
129 129
     pip install --upgrade pip
130 130
 

+ 4
- 4
src/freedombone-app-sip View File

@@ -166,8 +166,8 @@ function remove_sip {
166 166
     function_check remove_onion_service
167 167
     remove_onion_service sip ${SIP_PORT}
168 168
 
169
-    apt-get -y remove --purge sipwitch
170
-    apt-get -y remove --purge turnserver
169
+    apt-get -yq remove --purge sipwitch
170
+    apt-get -yq remove --purge turnserver
171 171
     if [ -f /etc/sipwitch.conf ]; then
172 172
         rm /etc/sipwitch.conf
173 173
     fi
@@ -256,7 +256,7 @@ function install_sip_main {
256 256
         return
257 257
     fi
258 258
 
259
-    apt-get -y install sipwitch
259
+    apt-get -yq install sipwitch
260 260
 
261 261
     function_check get_sip_server_password
262 262
     get_sip_server_password
@@ -340,7 +340,7 @@ function install_sip_turn {
340 340
         return
341 341
     fi
342 342
 
343
-    apt-get -y install turnserver
343
+    apt-get -yq install turnserver
344 344
 
345 345
     # create a nonce if needed
346 346
     if [ ! $TURN_NONCE ]; then

+ 3
- 3
src/freedombone-app-syncthing View File

@@ -465,7 +465,7 @@ function remove_syncthing {
465 465
     firewall_remove ${SYNCTHING_PORT}
466 466
     systemctl stop syncthing
467 467
     systemctl disable syncthing
468
-    apt-get -y remove --purge syncthing
468
+    apt-get -yq remove --purge syncthing
469 469
     rm /etc/systemd/system/syncthing.service
470 470
     sed -i "/${PROJECT_NAME}-syncthing/d" /etc/crontab
471 471
     remove_completion_param install_syncthing
@@ -483,12 +483,12 @@ function configure_firewall_for_syncthing {
483 483
 }
484 484
 
485 485
 function install_syncthing {
486
-    apt-get -y install curl
486
+    apt-get -yq install curl
487 487
 
488 488
     curl -s https://syncthing.net/release-key.txt | apt-key add -
489 489
     echo "deb http://apt.syncthing.net/ syncthing release" | tee /etc/apt/sources.list.d/syncthing.list
490 490
     apt-get update
491
-    apt-get -y install syncthing
491
+    apt-get -yq install syncthing
492 492
 
493 493
     # This probably does need to run as root so that it can access the Sync directories
494 494
     # in each user's home directory

+ 3
- 3
src/freedombone-app-tahoelafs View File

@@ -261,8 +261,8 @@ function tahoelafs_update_script {
261 261
 }
262 262
 
263 263
 function mesh_install_tahoelafs {
264
-    chroot "$rootdir" apt-get -y install build-essential python-pip python-dev
265
-    chroot "$rootdir" apt-get -y install libffi-dev libssl-dev python-virtualenv
264
+    chroot "$rootdir" apt-get -yq install build-essential python-pip python-dev
265
+    chroot "$rootdir" apt-get -yq install libffi-dev libssl-dev python-virtualenv
266 266
 
267 267
     git clone $TAHOELAFS_REPO $rootdir/var/lib/tahoelafs
268 268
     cd $rootdir/var/lib/tahoelafs
@@ -290,7 +290,7 @@ function install_tahoelafs {
290 290
         return
291 291
     fi
292 292
 
293
-    apt-get -y install build-essential python-pip python-dev libffi-dev libssl-dev python-virtualenv
293
+    apt-get -yq install build-essential python-pip python-dev libffi-dev libssl-dev python-virtualenv
294 294
 
295 295
     # create a user to run the introducer
296 296
     if [ ! -d /home/tahoelafs ]; then

+ 16
- 16
src/freedombone-app-tox View File

@@ -119,8 +119,8 @@ function mesh_tox_qtox {
119 119
         mkdir -p ${rootdir}$INSTALL_DIR
120 120
     fi
121 121
 
122
-    chroot "${rootdir}" apt-get -y install build-essential libatk1.0-0 libbz2-1.0 libc6 libcairo2 libdbus-1-3 libegl1-mesa libfontconfig1 libfreetype6 libgcc1 libgdk-pixbuf2.0-0 libgl1-mesa-glx libglib2.0-0 libgtk2.0-0 libice6 libicu52 libjpeg62-turbo libmng1 libmtdev1 libopenal1 libopus0 libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 libpng12-0 libqrencode3 libsm6 libsodium13 libsqlite3-0 libssl1.0.0 libstdc++6 libtiff5 libudev1 libvpx1 libwayland-client0 libwayland-cursor0 libwayland-egl1-mesa libwebp5 libx11-6 libx11-xcb1 libxcb-glx0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb-xinerama0 libxcb1 libxext6 libxfixes3 libxi6 libxrender1 libxss1 zlib1g libopus-dev libvpx-dev
123
-    chroot "${rootdir}" apt-get -y install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libxss-dev qrencode libqrencode-dev libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev libsqlcipher-dev libopus-dev libvpx-dev libavformat-dev libavdevice-dev libswscale-dev libavutil-dev libavcodec-dev libavcodec56 libavcodec57 libavfilter-dev libavfilter6
122
+    chroot "${rootdir}" apt-get -yq install build-essential libatk1.0-0 libbz2-1.0 libc6 libcairo2 libdbus-1-3 libegl1-mesa libfontconfig1 libfreetype6 libgcc1 libgdk-pixbuf2.0-0 libgl1-mesa-glx libglib2.0-0 libgtk2.0-0 libice6 libicu52 libjpeg62-turbo libmng1 libmtdev1 libopenal1 libopus0 libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 libpng12-0 libqrencode3 libsm6 libsodium13 libsqlite3-0 libssl1.0.0 libstdc++6 libtiff5 libudev1 libvpx1 libwayland-client0 libwayland-cursor0 libwayland-egl1-mesa libwebp5 libx11-6 libx11-xcb1 libxcb-glx0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb-xinerama0 libxcb1 libxext6 libxfixes3 libxi6 libxrender1 libxss1 zlib1g libopus-dev libvpx-dev
123
+    chroot "${rootdir}" apt-get -yq install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libxss-dev qrencode libqrencode-dev libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev libsqlcipher-dev libopus-dev libvpx-dev libavformat-dev libavdevice-dev libswscale-dev libavutil-dev libavcodec-dev libavcodec56 libavcodec57 libavfilter-dev libavfilter6
124 124
 
125 125
     mesh_install_ffmpeg
126 126
 
@@ -450,17 +450,17 @@ function mesh_tox_node {
450 450
     fi
451 451
 
452 452
     if [ $rootdir ]; then
453
-        chroot ${rootdir} apt-get -y install build-essential libtool autotools-dev
454
-        chroot ${rootdir} apt-get -y install automake checkinstall check git yasm
455
-        chroot ${rootdir} apt-get -y install libsodium13 libsodium-dev libcap2-bin
456
-        chroot ${rootdir} apt-get -y install libconfig9 libconfig-dev autoconf
457
-        chroot ${rootdir} apt-get -y install libopus-dev libvpx-dev
453
+        chroot ${rootdir} apt-get -yq install build-essential libtool autotools-dev
454
+        chroot ${rootdir} apt-get -yq install automake checkinstall check git yasm
455
+        chroot ${rootdir} apt-get -yq install libsodium13 libsodium-dev libcap2-bin
456
+        chroot ${rootdir} apt-get -yq install libconfig9 libconfig-dev autoconf
457
+        chroot ${rootdir} apt-get -yq install libopus-dev libvpx-dev
458 458
     else
459
-        apt-get -y install build-essential libtool autotools-dev
460
-        apt-get -y install automake checkinstall check git yasm
461
-        apt-get -y install libsodium13 libsodium-dev libcap2-bin
462
-        apt-get -y install libconfig9 libconfig-dev autoconf
463
-        apt-get -y install libopus-dev libvpx-dev
459
+        apt-get -yq install build-essential libtool autotools-dev
460
+        apt-get -yq install automake checkinstall check git yasm
461
+        apt-get -yq install libsodium13 libsodium-dev libcap2-bin
462
+        apt-get -yq install libconfig9 libconfig-dev autoconf
463
+        apt-get -yq install libopus-dev libvpx-dev
464 464
     fi
465 465
 
466 466
     if [ ! -d ${rootdir}${INSTALL_DIR} ]; then
@@ -638,11 +638,11 @@ function mesh_tox_client {
638 638
     fi
639 639
 
640 640
     if [ ${rootdir} ]; then
641
-        chroot ${rootdir} apt-get -y install libncursesw5-dev libconfig-dev libqrencode-dev
642
-        chroot ${rootdir} apt-get -y install libcurl4-openssl-dev libvpx-dev libopenal-dev
641
+        chroot ${rootdir} apt-get -yq install libncursesw5-dev libconfig-dev libqrencode-dev
642
+        chroot ${rootdir} apt-get -yq install libcurl4-openssl-dev libvpx-dev libopenal-dev
643 643
     else
644
-        apt-get -y install libncursesw5-dev libconfig-dev libqrencode-dev
645
-        apt-get -y install libcurl4-openssl-dev libvpx-dev libopenal-dev
644
+        apt-get -yq install libncursesw5-dev libconfig-dev libqrencode-dev
645
+        apt-get -yq install libcurl4-openssl-dev libvpx-dev libopenal-dev
646 646
     fi
647 647
 
648 648
     TEMP_SCRIPT_NAME=fbtmp728353.sh

+ 2
- 2
src/freedombone-app-vim View File

@@ -187,7 +187,7 @@ function restore_remote_vim {
187 187
 }
188 188
 
189 189
 function remove_vim {
190
-    apt-get -y remove --purge vim
190
+    apt-get -yq remove --purge vim
191 191
     update-alternatives --set editor /usr/bin/nano
192 192
     sed -i '/install_vim/d' $COMPLETION_FILE
193 193
 
@@ -210,7 +210,7 @@ function remove_vim {
210 210
 }
211 211
 
212 212
 function install_vim {
213
-    apt-get -y install vim
213
+    apt-get -yq install vim
214 214
     update-alternatives --set editor /usr/bin/vim
215 215
 
216 216
     # add a mutt entry to use Vim to compose emails

+ 2
- 2
src/freedombone-app-vpn View File

@@ -66,7 +66,7 @@ function restore_remote_vpn {
66 66
 }
67 67
 
68 68
 function remove_vpn {
69
-    apt-get -y remove --purge fastd
69
+    apt-get -yq remove --purge fastd
70 70
     remove_completion_param install_vpn
71 71
 }
72 72
 
@@ -79,7 +79,7 @@ function install_vpn {
79 79
         fi
80 80
         gpg -a --export 16EF3F64CB201D9C | sudo apt-key add -
81 81
         apt-get update
82
-        apt-get -y install fastd
82
+        apt-get -yq install fastd
83 83
         if [ ! "$?" = "0" ]; then
84 84
             exit 52026
85 85
         fi

+ 3
- 3
src/freedombone-app-webmail View File

@@ -156,9 +156,9 @@ function install_webmail {
156 156
     function_check repair_databases_script
157 157
     repair_databases_script
158 158
 
159
-    apt-get -y install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git
160
-    apt-get -y install php5-dev imagemagick php5-imagick php5-sqlite php-auth-sasl php-net-smtp php-mime-type
161
-    apt-get -y install php-mail-mime php-mail-mimedecode php-net-ldap3 php5-pspell
159
+    apt-get -yq install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git
160
+    apt-get -yq install php5-dev imagemagick php5-imagick php5-sqlite php-auth-sasl php-net-smtp php-mime-type
161
+    apt-get -yq install php-mail-mime php-mail-mimedecode php-net-ldap3 php5-pspell
162 162
     pear install Net_IDNA2
163 163
 
164 164
     if [ ! -f $WEBMAIL_PATH/index.php ]; then

+ 5
- 5
src/freedombone-app-xmpp View File

@@ -260,7 +260,7 @@ function configure_firewall_for_xmpp {
260 260
 }
261 261
 
262 262
 function remove_xmpp_client {
263
-    apt-get -y remove --purge profanity
263
+    apt-get -yq remove --purge profanity
264 264
     remove_completion_param install_xmpp_client
265 265
     remove_certs xmpp
266 266
 }
@@ -276,7 +276,7 @@ function remove_xmpp {
276 276
     function_check remove_onion_service
277 277
     remove_onion_service xmpp 5222 5223 5269
278 278
 
279
-    apt-get -y remove --purge prosody prosody-modules
279
+    apt-get -yq remove --purge prosody prosody-modules
280 280
     if [ -d $INSTALL_DIR/prosody-modules ]; then
281 281
         rm -rf $INSTALL_DIR/prosody-modules
282 282
     fi
@@ -307,8 +307,8 @@ function install_xmpp_main {
307 307
     if [[ $(app_is_installed xmpp_main) == "1" ]]; then
308 308
         return
309 309
     fi
310
-    apt-get -y install lua-sec lua-bitop
311
-    apt-get -y install prosody prosody-modules mercurial
310
+    apt-get -yq install lua-sec lua-bitop
311
+    apt-get -yq install prosody prosody-modules mercurial
312 312
 
313 313
     if [ ! -d /etc/prosody ]; then
314 314
         echo $"ERROR: prosody does not appear to have installed. $CHECK_MESSAGE"
@@ -479,7 +479,7 @@ function install_xmpp_client {
479 479
     if [[ $(app_is_installed xmpp_client) == "1" ]]; then
480 480
         return
481 481
     fi
482
-    apt-get -y install profanity
482
+    apt-get -yq install profanity
483 483
 
484 484
     XMPP_CLIENT_DIR=/home/$MY_USERNAME/.local/share/profanity
485 485
     XMPP_CLIENT_ACCOUNTS=$XMPP_CLIENT_DIR/accounts

+ 2
- 2
src/freedombone-app-zeronet View File

@@ -475,8 +475,8 @@ function mesh_zeronet {
475 475
         exit 432052
476 476
     fi
477 477
 
478
-    chroot "$rootdir" apt-get -y install python python-msgpack python-gevent
479
-    chroot "$rootdir" apt-get -y install python-pip bittornado
478
+    chroot "$rootdir" apt-get -yq install python python-msgpack python-gevent
479
+    chroot "$rootdir" apt-get -yq install python-pip bittornado
480 480
     chroot "$rootdir" pip install msgpack-python --upgrade
481 481
 
482 482
     chroot "$rootdir" useradd -d $MESH_INSTALL_DIR/zeronet/ -s /bin/false zeronet

+ 13
- 13
src/freedombone-base-email View File

@@ -122,7 +122,7 @@ function encrypt_incoming_email {
122 122
     fi
123 123
 
124 124
     if [ ! -f /usr/bin/gpgit.pl ]; then
125
-        apt-get -y install git libmail-gnupg-perl
125
+        apt-get -yq install git libmail-gnupg-perl
126 126
         cd $INSTALL_DIR
127 127
         function_check git_clone
128 128
         git_clone $GPGIT_REPO $INSTALL_DIR/gpgit
@@ -245,7 +245,7 @@ function email_client {
245 245
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
246 246
         return
247 247
     fi
248
-    apt-get -y install mutt-patched lynx abook
248
+    apt-get -yq install mutt-patched lynx abook
249 249
 
250 250
     if [ ! -f /etc/Muttrc ]; then
251 251
         echo $"ERROR: Mutt does not appear to have installed. $CHECK_MESSAGE"
@@ -439,7 +439,7 @@ function create_public_mailing_list {
439 439
 
440 440
     PUBLIC_MAILING_LIST_USER="mlmmj"
441 441
 
442
-    apt-get -y install mlmmj
442
+    apt-get -yq install mlmmj
443 443
     adduser --system $PUBLIC_MAILING_LIST_USER
444 444
     addgroup $PUBLIC_MAILING_LIST_USER
445 445
     adduser $PUBLIC_MAILING_LIST_USER $PUBLIC_MAILING_LIST_USER
@@ -541,7 +541,7 @@ function create_private_mailing_list {
541 541
         echo $'the top of the script'
542 542
         exit 11
543 543
     fi
544
-    apt-get -y install ruby ruby-dev ruby-gpgme libgpgme11-dev libmagic-dev
544
+    apt-get -yq install ruby ruby-dev ruby-gpgme libgpgme11-dev libmagic-dev
545 545
     gem install schleuder
546 546
     schleuder-fix-gem-dependencies
547 547
     schleuder-init-setup --gem
@@ -664,8 +664,8 @@ function remove_email {
664 664
 }
665 665
 
666 666
 function install_email_with_tor {
667
-    apt-get -y remove postfix
668
-    apt-get -y install exim4 sasl2-bin swaks libnet-ssleay-perl procmail xinetd
667
+    apt-get -yq remove postfix
668
+    apt-get -yq install exim4 sasl2-bin swaks libnet-ssleay-perl procmail xinetd
669 669
 
670 670
     if [ ! -d /etc/exim4 ]; then
671 671
         echo $"ERROR: Exim does not appear to have installed. $CHECK_MESSAGE"
@@ -896,8 +896,8 @@ function install_email_with_tor {
896 896
 }
897 897
 
898 898
 function install_email_basic {
899
-    apt-get -y remove postfix
900
-    apt-get -y install exim4 sasl2-bin swaks libnet-ssleay-perl procmail
899
+    apt-get -yq remove postfix
900
+    apt-get -yq install exim4 sasl2-bin swaks libnet-ssleay-perl procmail
901 901
 
902 902
     if [ ! -d /etc/exim4 ]; then
903 903
         echo $"ERROR: Exim does not appear to have installed. $CHECK_MESSAGE"
@@ -1062,8 +1062,8 @@ function spam_filtering {
1062 1062
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
1063 1063
         return
1064 1064
     fi
1065
-    apt-get -y install exim4-daemon-heavy
1066
-    apt-get -y install spamassassin
1065
+    apt-get -yq install exim4-daemon-heavy
1066
+    apt-get -yq install spamassassin
1067 1067
     if [ ! -f /etc/default/spamassassin ]; then
1068 1068
         echo 'Spamassassin was not installed'
1069 1069
         exit 72570
@@ -1226,7 +1226,7 @@ function configure_imap {
1226 1226
 
1227 1227
     dpkg -P dovecot-imapd
1228 1228
     dpkg -P dovecot-core
1229
-    apt-get -y install dovecot-imapd
1229
+    apt-get -yq install dovecot-imapd
1230 1230
 
1231 1231
     if [ ! -d /etc/dovecot ]; then
1232 1232
         echo $"ERROR: Dovecot does not appear to have installed. $CHECK_MESSAGE"
@@ -1394,7 +1394,7 @@ function create_gpg_subkey {
1394 1394
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
1395 1395
         return
1396 1396
     fi
1397
-    apt-get -y install gnupg
1397
+    apt-get -yq install gnupg
1398 1398
 
1399 1399
     GPG_KEY_USAGE=$1
1400 1400
     if [[ $GPG_KEY_USAGE != "sign" && $GPG_KEY_USAGE != "auth" && $GPG_KEY_USAGE != "encrypt" ]]; then
@@ -1462,7 +1462,7 @@ function configure_gpg {
1462 1462
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
1463 1463
         return
1464 1464
     fi
1465
-    apt-get -y install gnupg
1465
+    apt-get -yq install gnupg
1466 1466
 
1467 1467
     gpg_dir=/home/$MY_USERNAME/.gnupg
1468 1468
 

+ 3
- 3
src/freedombone-base-tripwire View File

@@ -40,7 +40,7 @@ function remove_tripwire {
40 40
     if ! grep -Fxq "tripwire" $COMPLETION_FILE; then
41 41
         return
42 42
     fi
43
-    apt-get -y remove --purge tripwire
43
+    apt-get -yq remove --purge tripwire
44 44
     if [ -d /etc/tripwire ]; then
45 45
         rm -rf /etc/tripwire
46 46
     fi
@@ -52,8 +52,8 @@ function install_tripwire {
52 52
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
53 53
         return
54 54
     fi
55
-    apt-get -y install tripwire
56
-    apt-get -y autoremove
55
+    apt-get -yq install tripwire
56
+    apt-get -yq autoremove
57 57
     cd /etc/tripwire
58 58
     cp site.key $DEFAULT_DOMAIN_NAME-site.key
59 59
     echo '*** Installing intrusion detection ***'

+ 4
- 4
src/freedombone-client View File

@@ -86,7 +86,7 @@ function global_rate_limit {
86 86
 function refresh_gpg_keys {
87 87
     if [ ! -f /usr/bin/gpg ]; then
88 88
         if [ ! -f /usr/bin/pacman ]; then
89
-            sudo apt-get -y install gnupg
89
+            sudo apt-get -yq install gnupg
90 90
         else
91 91
             sudo pacman -S --noconfirm gnupg
92 92
         fi
@@ -111,7 +111,7 @@ function configure_ssh_client {
111 111
     if [ -f /usr/bin/pacman ]; then
112 112
         sudo pacman --noconfirm -S openbsd-netcat
113 113
     else
114
-        sudo apt-get -y install tor connect-proxy
114
+        sudo apt-get -yq install tor connect-proxy
115 115
     fi
116 116
 
117 117
     #sudo sed -i 's/#   PasswordAuthentication.*/   PasswordAuthentication no/g' /etc/ssh/ssh_config
@@ -192,7 +192,7 @@ function configure_monkeysphere {
192 192
     if [ -f /usr/bin/pacman ]; then
193 193
         return
194 194
     fi
195
-    sudo apt-get -y install monkeysphere
195
+    sudo apt-get -yq install monkeysphere
196 196
 }
197 197
 
198 198
 function show_help {
@@ -241,7 +241,7 @@ configure_monkeysphere
241 241
 if [[ $MESH_CLIENT_INSTALL == $'yes' || $MESH_CLIENT_INSTALL == $'y' || $MESH_CLIENT_INSTALL == $'on' ]]; then
242 242
     echo $'Installing mesh packages'
243 243
     if [ ! -f /usr/bin/pacman ]; then
244
-        sudo apt-get -y install avahi-utils avahi-autoipd avahi-dnsconfd
244
+        sudo apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd
245 245
     else
246 246
         sudo pacman -S --noconfirm avahi nss-mdns
247 247
         sudo sed -i 's|hosts:.*|hosts: files mdns_minimal [NOTFOUND=return] dns myhostname|g' /etc/nsswitch.conf

+ 2
- 2
src/freedombone-config View File

@@ -890,7 +890,7 @@ function interactive_gpg_from_remote {
890 890
     fi
891 891
 
892 892
     # try to recover the key from the servers
893
-    apt-get -y install libgfshare-bin gnupg
893
+    apt-get -yq install libgfshare-bin gnupg
894 894
     ${PROJECT_NAME}-recoverkey -u $MY_USERNAME -l $REMOTE_SERVERS_LIST
895 895
     if [ ! "$?" = "0" ]; then
896 896
         dialog --title $"Encryption keys" --msgbox $'Your key could not be recovered' 6 70
@@ -912,7 +912,7 @@ function reconstruct_key {
912 912
         dialog --title $"Encryption keys" --msgbox $'Not enough fragments to reconstruct the key' 6 70
913 913
         exit 7348
914 914
     fi
915
-    apt-get -y install libgfshare-bin gnupg
915
+    apt-get -yq install libgfshare-bin gnupg
916 916
     gfcombine /home/$MY_USERNAME/.gnupg_fragments/keyshare*
917 917
     if [ ! "$?" = "0" ]; then
918 918
         dialog --title $"Encryption keys" --msgbox $'Unable to reconstruct the key' 6 70

+ 4
- 4
src/freedombone-image View File

@@ -134,10 +134,10 @@ function image_setup {
134 134
 
135 135
     case $setup_type in
136 136
         debian|ubuntu|trisquel|mint)
137
-            sudo apt-get -y install build-essential libc6-dev-i386 gcc-multilib g++-multilib
138
-            sudo apt-get -y install git python-docutils mktorrent vmdebootstrap xz-utils
139
-            sudo apt-get -y install dosfstools btrfs-tools extlinux python-distro-info mbr
140
-            sudo apt-get -y install qemu-user-static binfmt-support u-boot-tools qemu
137
+            sudo apt-get -yq install build-essential libc6-dev-i386 gcc-multilib g++-multilib
138
+            sudo apt-get -yq install git python-docutils mktorrent vmdebootstrap xz-utils
139
+            sudo apt-get -yq install dosfstools btrfs-tools extlinux python-distro-info mbr
140
+            sudo apt-get -yq install qemu-user-static binfmt-support u-boot-tools qemu
141 141
             ;;
142 142
         parabola|arch)
143 143
             sudo pacman -S --noconfirm libc++ git gcc gcc-libs python-docutils mktorrent patch

+ 19
- 19
src/freedombone-image-customise View File

@@ -569,7 +569,7 @@ initialise_mesh() {
569 569
 
570 570
         # install proprietary wifi drivers
571 571
         # see https://wiki.debian.org/iwlwifi
572
-        chroot "$rootdir" apt-get -y install firmware-iwlwifi firmware-b43-installer firmware-brcm80211
572
+        chroot "$rootdir" apt-get -yq install firmware-iwlwifi firmware-b43-installer firmware-brcm80211
573 573
     fi
574 574
 
575 575
     INSTALLING_MESH=1
@@ -735,37 +735,37 @@ function configure_user_interface {
735 735
     fi
736 736
 
737 737
     # desktop
738
-    chroot "$rootdir" apt-get -y install mate-desktop-environment
738
+    chroot "$rootdir" apt-get -yq install mate-desktop-environment
739 739
 
740 740
     # tool to change desktop settings from command line
741
-    chroot "$rootdir" apt-get -y install dconf-cli dconf-gsettings-backend dbus dbus-x11
741
+    chroot "$rootdir" apt-get -yq install dconf-cli dconf-gsettings-backend dbus dbus-x11
742 742
 
743 743
     # for tomb
744
-    chroot "$rootdir" apt-get -y install pinentry-gtk2
744
+    chroot "$rootdir" apt-get -yq install pinentry-gtk2
745 745
 
746 746
     # for tox video
747
-    chroot "$rootdir" apt-get -y install ffmpeg cheese v4l-utils
747
+    chroot "$rootdir" apt-get -yq install ffmpeg cheese v4l-utils
748 748
 
749 749
     # to provide notifications
750
-    chroot "$rootdir" apt-get -y install libnotify-bin
750
+    chroot "$rootdir" apt-get -yq install libnotify-bin
751 751
 
752 752
     # for video/audio
753
-    chroot "$rootdir" apt-get -y install libtheora-bin libvorbis-dev v4l-utils
753
+    chroot "$rootdir" apt-get -yq install libtheora-bin libvorbis-dev v4l-utils
754 754
 
755 755
     # a sane editor
756
-    chroot "$rootdir" apt-get -y install emacs24
756
+    chroot "$rootdir" apt-get -yq install emacs24
757 757
 
758 758
     # for wifi monitoring
759
-    chroot "$rootdir" apt-get -y install horst
759
+    chroot "$rootdir" apt-get -yq install horst
760 760
 
761 761
     # for sound level control
762
-    chroot "$rootdir" apt-get -y install alsa-utils
762
+    chroot "$rootdir" apt-get -yq install alsa-utils
763 763
 
764 764
     # to play various media types
765
-    chroot "$rootdir" apt-get -y install vlc
765
+    chroot "$rootdir" apt-get -yq install vlc
766 766
 
767 767
     # android adb to allow phones to be connected and for example transfer photos/documents
768
-    chroot "$rootdir" apt-get -y install android-tools-adb
768
+    chroot "$rootdir" apt-get -yq install android-tools-adb
769 769
 
770 770
     # Produce a text file on the desktop listing users on the mesh
771 771
     cat <<EOF > $rootdir/usr/bin/list-tox-users
@@ -903,11 +903,11 @@ EOF
903 903
             fi
904 904
         fi
905 905
     else
906
-        chroot "$rootdir" apt-get -y install lightdm
906
+        chroot "$rootdir" apt-get -yq install lightdm
907 907
     fi
908 908
 
909 909
     # browser
910
-    chroot "$rootdir" apt-get -y install $BROWSER
910
+    chroot "$rootdir" apt-get -yq install $BROWSER
911 911
 
912 912
     # help
913 913
     mkdir -p $rootdir/home/${MY_USERNAME}/help/images
@@ -932,15 +932,15 @@ EOF
932 932
         # xmpp client
933 933
         chroot "$rootdir" echo "deb ftp://ftp.gajim.org/debian unstable main" > /etc/apt/sources.list.d/gajim.list
934 934
         chroot "$rootdir" apt-get update
935
-        chroot "$rootdir" apt-get -y install gajim-dev-keyring
936
-        chroot "$rootdir" apt-get -y install git python-dev python-pip gajim-nightly
935
+        chroot "$rootdir" apt-get -yq install gajim-dev-keyring
936
+        chroot "$rootdir" apt-get -yq install git python-dev python-pip gajim-nightly
937 937
         chroot "$rootdir" mkdir /home/$GENERIC_IMAGE_USERNAME/.local/share/gajim/plugins -p
938 938
         chroot "$rootdir" git clone https://github.com/omemo/gajim-omemo /home/$GENERIC_IMAGE_USERNAME/.local/share/gajim/plugins/gajim-omemo
939 939
         chroot "$rootdir" pip install protobuf==2.6.1, python-axolotl==0.1.35
940 940
         chroot "$rootdir" /bin/chown -R $GENERIC_IMAGE_USERNAME:$GENERIC_IMAGE_USERNAME /home/$GENERIC_IMAGE_USERNAME/.local
941 941
 
942 942
         # IRC client
943
-        chroot "$rootdir" apt-get -y install hexchat profanity
943
+        chroot "$rootdir" apt-get -yq install hexchat profanity
944 944
     fi
945 945
 }
946 946
 
@@ -1043,9 +1043,9 @@ rm $rootdir/usr/sbin/policy-rc.d
1043 1043
 # Set up HRNG for systems known to have one
1044 1044
 # Otherwise install haveged
1045 1045
 if [[ "$MACHINE" != "beaglebone" ]]; then
1046
-    chroot $rootdir apt-get -y install haveged
1046
+    chroot $rootdir apt-get -yq install haveged
1047 1047
 else
1048
-    chroot $rootdir apt-get -y install rng-tools
1048
+    chroot $rootdir apt-get -yq install rng-tools
1049 1049
     sed -i 's|#HRNGDEVICE=/dev/hwrng|HRNGDEVICE=/dev/hwrng|g' $rootdir/etc/default/rng-tools
1050 1050
 fi
1051 1051
 

+ 4
- 4
src/freedombone-mesh View File

@@ -69,10 +69,10 @@ function install_toxcore {
69 69
         return
70 70
     fi
71 71
 
72
-    sudo apt-get -y install build-essential libtool autotools-dev
73
-    sudo apt-get -y install automake checkinstall check git yasm
74
-    sudo apt-get -y install libsodium13 libsodium-dev libcap2-bin
75
-    sudo apt-get -y install libconfig9 libconfig-dev
72
+    sudo apt-get -yq install build-essential libtool autotools-dev
73
+    sudo apt-get -yq install automake checkinstall check git yasm
74
+    sudo apt-get -yq install libsodium13 libsodium-dev libcap2-bin
75
+    sudo apt-get -yq install libconfig9 libconfig-dev
76 76
 
77 77
     if [ ! -d ~/develop ]; then
78 78
         mkdir ~/develop

+ 6
- 6
src/freedombone-mesh-install View File

@@ -93,7 +93,7 @@ function show_help {
93 93
 }
94 94
 
95 95
 function mesh_avahi {
96
-    $CHROOT_PREFIX apt-get -y install avahi-utils avahi-autoipd avahi-dnsconfd
96
+    $CHROOT_PREFIX apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd
97 97
 
98 98
     decarray=( 1 2 3 4 5 6 7 8 9 0 )
99 99
     PEER_ID=${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}
@@ -139,9 +139,9 @@ function install_batman_remove {
139 139
 }
140 140
 
141 141
 function install_batman {
142
-    $CHROOT_PREFIX apt-get -y install iproute bridge-utils libnetfilter-conntrack3 batctl
143
-    $CHROOT_PREFIX apt-get -y install python-dev libevent-dev ebtables python-pip git
144
-    $CHROOT_PREFIX apt-get -y install wireless-tools rfkill
142
+    $CHROOT_PREFIX apt-get -yq install iproute bridge-utils libnetfilter-conntrack3 batctl
143
+    $CHROOT_PREFIX apt-get -yq install python-dev libevent-dev ebtables python-pip git
144
+    $CHROOT_PREFIX apt-get -yq install wireless-tools rfkill
145 145
 
146 146
     if ! grep -q "batman_adv" $rootdir/etc/modules; then
147 147
     echo 'batman_adv' >> $rootdir/etc/modules
@@ -241,13 +241,13 @@ function enable_tox_repo {
241 241
 
242 242
 function mesh_tox_client_qtox {
243 243
     enable_tox_repo
244
-    sudo apt-get -y install qtox
244
+    sudo apt-get -yq install qtox
245 245
     echo "qTox Installed."
246 246
 }
247 247
 
248 248
 function mesh_tox_client_toxic_from_repo {
249 249
     enable_tox_repo
250
-    sudo apt-get -y install toxic
250
+    sudo apt-get -yq install toxic
251 251
     echo "Toxic Installed."
252 252
 }
253 253
 

+ 1
- 1
src/freedombone-recoverkey View File

@@ -118,7 +118,7 @@ function reconstruct_key {
118 118
         dialog --title $"Encryption keys" --msgbox $'Not enough fragments to reconstruct the key' 6 70
119 119
         exit 7348
120 120
     fi
121
-    apt-get -y install libgfshare-bin gnupg
121
+    apt-get -yq install libgfshare-bin gnupg
122 122
     gfcombine /home/$MY_USERNAME/.gnupg_fragments/keyshare*
123 123
     if [ ! "$?" = "0" ]; then
124 124
         dialog --title $"Encryption keys" --msgbox $'Unable to reconstruct the key' 6 70

+ 1
- 1
src/freedombone-utils-avahi View File

@@ -55,7 +55,7 @@ function create_avahi_service {
55 55
 }
56 56
 
57 57
 function mesh_avahi {
58
-    chroot "$rootdir" apt-get -y install avahi-utils avahi-autoipd avahi-dnsconfd
58
+    chroot "$rootdir" apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd
59 59
 
60 60
     decarray=( 1 2 3 4 5 6 7 8 9 0 )
61 61
     PEER_ID=${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}${decarray[$RANDOM%10]}

+ 1
- 1
src/freedombone-utils-backup View File

@@ -52,7 +52,7 @@ function configure_backup_key {
52 52
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
53 53
         return
54 54
     fi
55
-    apt-get -y install gnupg
55
+    apt-get -yq install gnupg
56 56
 
57 57
     BACKUP_KEY_EXISTS=$(gpg_key_exists "root" "$MY_NAME (backup key)")
58 58
     if [[ $BACKUP_KEY_EXISTS == "yes" ]]; then

+ 2
- 2
src/freedombone-utils-cmake View File

@@ -36,7 +36,7 @@ function mesh_install_cmake {
36 36
         chroot "$rootdir" mkdir -p $INSTALL_DIR
37 37
     fi
38 38
 
39
-    chroot "$rootdir" apt-get -y install build-essential
39
+    chroot "$rootdir" apt-get -yq install build-essential
40 40
 
41 41
     git clone $CMAKE_REPO $rootdir$INSTALL_DIR/cmake
42 42
     cd $rootdir$INSTALL_DIR/cmake
@@ -83,7 +83,7 @@ function install_cmake {
83 83
         mkdir -p $INSTALL_DIR
84 84
     fi
85 85
 
86
-    apt-get -y install build-essential
86
+    apt-get -yq install build-essential
87 87
 
88 88
     git_clone $CMAKE_REPO $INSTALL_DIR/cmake
89 89
     cd $INSTALL_DIR/cmake

+ 2
- 2
src/freedombone-utils-cryptopp View File

@@ -36,7 +36,7 @@ function mesh_install_cryptopp {
36 36
         chroot "$rootdir" mkdir -p $INSTALL_DIR
37 37
     fi
38 38
 
39
-    chroot "$rootdir" apt-get -y install build-essential
39
+    chroot "$rootdir" apt-get -yq install build-essential
40 40
 
41 41
     git clone $CRYPTOPP_REPO $rootdir$INSTALL_DIR/cryptopp
42 42
     cd $rootdir$INSTALL_DIR/cryptopp
@@ -84,7 +84,7 @@ function install_cryptopp {
84 84
         mkdir -p $INSTALL_DIR
85 85
     fi
86 86
 
87
-    apt-get -y install build-essential
87
+    apt-get -yq install build-essential
88 88
 
89 89
     git_clone $CRYPTOPP_REPO $INSTALL_DIR/cryptopp
90 90
     cd $INSTALL_DIR/cryptopp

+ 7
- 7
src/freedombone-utils-database View File

@@ -120,9 +120,9 @@ function install_mariadb {
120 120
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
121 121
         return
122 122
     fi
123
-    apt-get -y install python-software-properties debconf-utils
124
-    apt-get -y install software-properties-common
125
-    apt-get -y update
123
+    apt-get -yq install python-software-properties debconf-utils
124
+    apt-get -yq install software-properties-common
125
+    apt-get -yq update
126 126
 
127 127
     function_check get_mariadb_password
128 128
     get_mariadb_password
@@ -147,8 +147,8 @@ function install_mariadb {
147 147
 
148 148
     debconf-set-selections <<< "mariadb-server mariadb-server/root_password password $MARIADB_PASSWORD"
149 149
     debconf-set-selections <<< "mariadb-server mariadb-server/root_password_again password $MARIADB_PASSWORD"
150
-    apt-get -y install mariadb-server
151
-    apt-get -y remove --purge apache*
150
+    apt-get -yq install mariadb-server
151
+    apt-get -yq remove --purge apache*
152 152
     if [ -d /etc/apache2 ]; then
153 153
         rm -rf /etc/apache2
154 154
         echo $'Removed Apache installation after MariaDB install'
@@ -278,10 +278,10 @@ function drop_database {
278 278
 }
279 279
 
280 280
 function database_reinstall {
281
-    apt-get -y purge mariadb*
281
+    apt-get -yq purge mariadb*
282 282
     rm -rf /var/lib/mysql
283 283
     rm -rf /etc/mysql
284
-    apt-get -y install mariadb-server
284
+    apt-get -yq install mariadb-server
285 285
 }
286 286
 
287 287
 # NOTE: deliberately there is no "exit 0"

+ 3
- 3
src/freedombone-utils-ffmpeg View File

@@ -32,9 +32,9 @@ FFMPEG_VERSION=3.1.2
32 32
 
33 33
 function mesh_install_ffmpeg
34 34
 {
35
-    chroot "${rootdir}" apt-get -y remove ffmpeg libav-tools
36
-    chroot "${rootdir}" apt-get -y install build-essential
37
-    chroot "${rootdir}" apt-get -y install --reinstall libmp3lame-dev libvorbis-dev libtheora-dev libspeex-dev yasm pkg-config libopenjpeg-dev libx264-dev mjpegtools libmjpegtools-dev
35
+    chroot "${rootdir}" apt-get -yq remove ffmpeg libav-tools
36
+    chroot "${rootdir}" apt-get -yq install build-essential
37
+    chroot "${rootdir}" apt-get -yq install --reinstall libmp3lame-dev libvorbis-dev libtheora-dev libspeex-dev yasm pkg-config libopenjpeg-dev libx264-dev mjpegtools libmjpegtools-dev
38 38
     mkdir -p ${rootdir}$INSTALL_DIR/ffmpeg-release
39 39
     cd ${rootdir}$INSTALL_DIR
40 40
     wget http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2

+ 2
- 2
src/freedombone-utils-filesystem View File

@@ -32,7 +32,7 @@ TOMB_REPO="https://github.com/dyne/Tomb"
32 32
 TOMB_COMMIT='c80ebd6d6ed77980eb5b559757e03ea13a29bdd1'
33 33
 
34 34
 function mesh_install_tomb {
35
-    chroot ${rootdir} apt-get -y install cryptsetup zsh pinentry-curses
35
+    chroot ${rootdir} apt-get -yq install cryptsetup zsh pinentry-curses
36 36
 
37 37
     if [ ! -d ${rootdir}/$INSTALL_DIR ]; then
38 38
         mkdir -p ${rootdir}/$INSTALL_DIR
@@ -67,7 +67,7 @@ function install_tomb {
67 67
         fi
68 68
     fi
69 69
 
70
-    apt-get -y install cryptsetup zsh pinentry-curses
70
+    apt-get -yq install cryptsetup zsh pinentry-curses
71 71
 
72 72
     if [ ! -d $INSTALL_DIR ]; then
73 73
         mkdir -p $INSTALL_DIR

+ 2
- 0
src/freedombone-utils-final View File

@@ -86,6 +86,8 @@ function setup_final {
86 86
 
87 87
     function_check install_final
88 88
     install_final
89
+
90
+    export DEBIAN_FRONTEND=
89 91
 }
90 92
 
91 93
 # NOTE: deliberately no exit 0

+ 3
- 3
src/freedombone-utils-go View File

@@ -77,9 +77,9 @@ function mesh_upgrade_golang_from_source {
77 77
     cat <<EOF > ${rootdir}/root/upgrade_golang.sh
78 78
 #!/bin/bash
79 79
 
80
-apt-get -y install build-essential libc6-dev
81
-apt-get -y install gcc-multilib g++-multilib make
82
-apt-get -y install curl git mercurial binutils bison
80
+apt-get -yq install build-essential libc6-dev
81
+apt-get -yq install gcc-multilib g++-multilib make
82
+apt-get -yq install curl git mercurial binutils bison
83 83
 
84 84
 if [ -d /home/go/Maildir ]; then
85 85
     rm -rf /home/go/Maildir

+ 1
- 1
src/freedombone-utils-international View File

@@ -33,7 +33,7 @@ function locale_setup {
33 33
         return
34 34
     fi
35 35
 
36
-    apt-get -y install locales locales-all debconf
36
+    apt-get -yq install locales locales-all debconf
37 37
 
38 38
     if [ ! "$DEFAULT_LANGUAGE" ]; then
39 39
         DEFAULT_LANGUAGE='en_GB.UTF-8'

+ 1
- 1
src/freedombone-utils-monkeysphere View File

@@ -32,7 +32,7 @@ function install_monkeysphere {
32 32
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
33 33
         return
34 34
     fi
35
-    apt-get -y install monkeysphere msva-perl
35
+    apt-get -yq install monkeysphere msva-perl
36 36
     #su -c "monkeysphere gen-subkey $MY_GPG_PUBLIC_KEY_ID" - $MY_USERNAME
37 37
     mkdir /home/$MY_USERNAME/.monkeysphere
38 38
     chmod 755 /home/$MY_USERNAME/.monkeysphere

+ 4
- 4
src/freedombone-utils-nodejs View File

@@ -37,8 +37,8 @@ NODEJS_VERSION='6.2.2'
37 37
 NODEJS_N_VERSION='2.1.4'
38 38
 
39 39
 function mesh_install_nodejs {
40
-    chroot "${rootdir}" apt-get -y install nodejs
41
-    chroot "${rootdir}" apt-get -y install npm curl
40
+    chroot "${rootdir}" apt-get -yq install nodejs
41
+    chroot "${rootdir}" apt-get -yq install npm curl
42 42
 
43 43
     if [ ! -f ${rootdir}/usr/bin/nodejs ]; then
44 44
         echo $'nodejs was not installed'
@@ -74,8 +74,8 @@ function install_nodejs {
74 74
         return
75 75
     fi
76 76
 
77
-    apt-get -y install nodejs
78
-    apt-get -y install npm curl
77
+    apt-get -yq install nodejs
78
+    apt-get -yq install npm curl
79 79
 
80 80
     if [ ! -f /usr/bin/nodejs ]; then
81 81
         echo $'nodejs was not installed'

+ 3
- 3
src/freedombone-utils-onion View File

@@ -191,7 +191,7 @@ function enable_ssh_via_onion {
191 191
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
192 192
         return
193 193
     fi
194
-    apt-get -y install tor connect-proxy
194
+    apt-get -yq install tor connect-proxy
195 195
     if ! grep -q 'Host *.onion' /home/$MY_USERNAME/.ssh/config; then
196 196
         if [ ! -d /home/$MY_USERNAME/.ssh ]; then
197 197
             mkdir /home/$MY_USERNAME/.ssh
@@ -233,7 +233,7 @@ function install_tor {
233 233
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
234 234
         return
235 235
     fi
236
-    apt-get -y install tor
236
+    apt-get -yq install tor
237 237
     if [ ! -f /etc/tor/torrc ]; then
238 238
         echo 'Tor failed to install'
239 239
         exit 38259
@@ -282,7 +282,7 @@ function route_outgoing_traffic_through_tor {
282 282
     if [[ $ROUTE_THROUGH_TOR != "yes" ]]; then
283 283
         return
284 284
     fi
285
-    apt-get -y install tor tor-arm
285
+    apt-get -yq install tor tor-arm
286 286
 
287 287
     ### set variables
288 288
     # Destinations you don't want routed through Tor

+ 1
- 1
src/freedombone-utils-passwords View File

@@ -44,7 +44,7 @@ function enforce_good_passwords {
44 44
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
45 45
         return
46 46
     fi
47
-    apt-get -y install libpam-cracklib
47
+    apt-get -yq install libpam-cracklib
48 48
 
49 49
     sed -i 's/password.*requisite.*pam_cracklib.so.*/password        required                       pam_cracklib.so retry=2 dcredit=-4 ucredit=-1 ocredit=-1 lcredit=0 minlen=10 reject_username/g' /etc/pam.d/common-password
50 50
     mark_completed $FUNCNAME

+ 2
- 2
src/freedombone-utils-repos View File

@@ -58,7 +58,7 @@ function create_repo_sources {
58 58
     echo "deb-src http://${DEBIAN_REPO}/debian/ ${DEBIAN_VERSION}-backports main" >> /etc/apt/sources.list
59 59
 
60 60
     apt-get update
61
-    apt-get -y install apt-transport-https
61
+    apt-get -yq install apt-transport-https
62 62
 
63 63
     mark_completed $FUNCNAME
64 64
 }
@@ -108,7 +108,7 @@ function create_git_project {
108 108
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
109 109
         return
110 110
     fi
111
-    apt-get -y install git
111
+    apt-get -yq install git
112 112
 
113 113
     echo '#!/bin/bash' > /usr/bin/$CREATE_GIT_PROJECT_COMMAND
114 114
     echo '' >> /usr/bin/$CREATE_GIT_PROJECT_COMMAND

+ 4
- 4
src/freedombone-utils-rng View File

@@ -77,12 +77,12 @@ function check_onerng_verification {
77 77
     fi
78 78
     echo $'OneRNG firmware verification passed'
79 79
     # if haveged was previously installed then remove it
80
-    apt-get -y remove haveged
80
+    apt-get -yq remove haveged
81 81
     mark_completed $FUNCNAME
82 82
 }
83 83
 
84 84
 function install_onerng {
85
-    apt-get -y install rng-tools at python-gnupg
85
+    apt-get -yq install rng-tools at python-gnupg
86 86
 
87 87
     # Move to the installation directory
88 88
     if [ ! -d $INSTALL_DIR ]; then
@@ -149,7 +149,7 @@ function random_number_generator {
149 149
 
150 150
     case $HWRNG_TYPE in
151 151
         beaglebone)
152
-            apt-get -y install rng-tools
152
+            apt-get -yq install rng-tools
153 153
             sed -i 's|#HRNGDEVICE=/dev/hwrng|HRNGDEVICE=/dev/hwrng|g' /etc/default/rng-tools
154 154
             ;;
155 155
         onerng)
@@ -157,7 +157,7 @@ function random_number_generator {
157 157
             install_onerng
158 158
             ;;
159 159
         *)
160
-            apt-get -y install haveged
160
+            apt-get -yq install haveged
161 161
             ;;
162 162
     esac
163 163
 

+ 13
- 13
src/freedombone-utils-setup View File

@@ -111,19 +111,19 @@ function initial_setup {
111 111
         return
112 112
     fi
113 113
 
114
-    apt-get -y remove --purge apache*
115
-    apt-get -y dist-upgrade
116
-    apt-get -y install ca-certificates
117
-    apt-get -y install apt-utils
118
-    apt-get -y install cryptsetup libgfshare-bin obnam sshpass wget avahi-daemon
119
-    apt-get -y install avahi-utils avahi-discover connect-proxy openssh-server
120
-    apt-get -y install sudo git dialog build-essential avahi-daemon avahi-utils
121
-    apt-get -y install avahi-discover avahi-autoipd iptables dnsutils net-tools
122
-    apt-get -y install network-manager iputils-ping libnss-mdns libnss-myhostname
123
-    apt-get -y install libnss-gw-name nano man ntp locales locales-all debconf
124
-    apt-get -y install wireless-tools wpasupplicant usbutils cryptsetup zsh
125
-    apt-get -y install pinentry-curses eatmydata iotop bc grub2 hostapd haveged
126
-    apt-get -y install cpulimit
114
+    apt-get -yq remove --purge apache*
115
+    apt-get -yq dist-upgrade
116
+    apt-get -yq install ca-certificates
117
+    apt-get -yq install apt-utils
118
+    apt-get -yq install cryptsetup libgfshare-bin obnam sshpass wget avahi-daemon
119
+    apt-get -yq install avahi-utils avahi-discover connect-proxy openssh-server
120
+    apt-get -yq install sudo git dialog build-essential avahi-daemon avahi-utils
121
+    apt-get -yq install avahi-discover avahi-autoipd iptables dnsutils net-tools
122
+    apt-get -yq install network-manager iputils-ping libnss-mdns libnss-myhostname
123
+    apt-get -yq install libnss-gw-name nano man ntp locales locales-all debconf
124
+    apt-get -yq install wireless-tools wpasupplicant usbutils cryptsetup zsh
125
+    apt-get -yq install pinentry-curses eatmydata iotop bc grub2 hostapd haveged
126
+    apt-get -yq install cpulimit
127 127
 
128 128
     if [ ! -d $INSTALL_DIR ]; then
129 129
         mkdir -p $INSTALL_DIR

+ 1
- 1
src/freedombone-utils-ssh View File

@@ -78,7 +78,7 @@ function configure_ssh {
78 78
         echo "KexAlgorithms $SSH_KEX" >> /etc/ssh/sshd_config
79 79
     fi
80 80
 
81
-    apt-get -y install fail2ban
81
+    apt-get -yq install fail2ban
82 82
 
83 83
     function_check configure_firewall_for_ssh
84 84
     configure_firewall_for_ssh

+ 1
- 1
src/freedombone-utils-time View File

@@ -31,7 +31,7 @@
31 31
 function check_date {
32 32
     curr_date=$(date)
33 33
     if [[ $curr_date == *"1970"* ]]; then
34
-        apt-get -y install ntp
34
+        apt-get -yq install ntp
35 35
     fi
36 36
 }
37 37
 

+ 2
- 2
src/freedombone-utils-tracker View File

@@ -31,7 +31,7 @@
31 31
 TRACKER_PORT=6969
32 32
 
33 33
 function mesh_install_tracker {
34
-    chroot "$rootdir" apt-get -y install bittornado nginx
34
+    chroot "$rootdir" apt-get -yq install bittornado nginx
35 35
 
36 36
     TRACKER_DAEMON=$rootdir/etc/systemd/system/tracker.service
37 37
     echo '[Unit]' > $TRACKER_DAEMON
@@ -69,7 +69,7 @@ function install_tracker {
69 69
         return
70 70
     fi
71 71
 
72
-    apt-get -y install bittornado nginx
72
+    apt-get -yq install bittornado nginx
73 73
 
74 74
     TRACKER_DAEMON=/etc/systemd/system/tracker.service
75 75
     echo '[Unit]' > $TRACKER_DAEMON

+ 1
- 1
src/freedombone-utils-upgrade View File

@@ -42,7 +42,7 @@ function create_upgrade_script {
42 42
         return
43 43
     fi
44 44
 
45
-    apt-get -y install unattended-upgrades
45
+    apt-get -yq install unattended-upgrades
46 46
 
47 47
     mark_completed $FUNCNAME
48 48
 }

+ 6
- 6
src/freedombone-utils-web View File

@@ -350,7 +350,7 @@ function install_dynamicdns {
350 350
     # Debian version 1.99.4-1
351 351
     # https version 1.99.8
352 352
 
353
-    apt-get -y install build-essential curl libgnutls28-dev automake1.11
353
+    apt-get -yq install build-essential curl libgnutls28-dev automake1.11
354 354
     if [ ! -d $INSTALL_DIR/inadyn ]; then
355 355
         git_clone $INADYN_REPO $INSTALL_DIR/inadyn
356 356
     fi
@@ -410,7 +410,7 @@ function install_command_line_browser {
410 410
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
411 411
         return
412 412
     fi
413
-    apt-get -y install elinks
413
+    apt-get -yq install elinks
414 414
 
415 415
     # set the home page
416 416
     if ! grep -q "WWW_HOME" /home/$MY_USERNAME/.bashrc; then
@@ -426,11 +426,11 @@ function install_command_line_browser {
426 426
 
427 427
 function mesh_web_server {
428 428
     if [ -d /etc/apache2 ]; then
429
-        chroot "$rootdir" apt-get -y remove --purge apache2
429
+        chroot "$rootdir" apt-get -yq remove --purge apache2
430 430
         chroot "$rootdir" rm -rf /etc/apache2
431 431
     fi
432 432
 
433
-    chroot "$rootdir" apt-get -y install nginx
433
+    chroot "$rootdir" apt-get -yq install nginx
434 434
 
435 435
     if [ ! -d $rootdir/etc/nginx ]; then
436 436
         echo $'Unable to install web server'
@@ -452,12 +452,12 @@ function install_web_server {
452 452
         return
453 453
     fi
454 454
     # remove apache
455
-    apt-get -y remove --purge apache2
455
+    apt-get -yq remove --purge apache2
456 456
     if [ -d /etc/apache2 ]; then
457 457
         rm -rf /etc/apache2
458 458
     fi
459 459
     # install nginx
460
-    apt-get -y install nginx php5-fpm git
460
+    apt-get -yq install nginx php5-fpm git
461 461
 
462 462
     # limit the number of php processes
463 463
     sed -i 's/; process.max =.*/process.max = 32/g' /etc/php5/fpm/php-fpm.conf

+ 1
- 1
src/freedombone-utils-wifi View File

@@ -162,7 +162,7 @@ function install_atheros_wifi {
162 162
     if [ -f /lib/firmware/htc_9271.fw ]; then
163 163
         return
164 164
     fi
165
-    apt-get -y install build-essential cmake git m4 texinfo
165
+    apt-get -yq install build-essential cmake git m4 texinfo
166 166
     if [ ! -d $INSTALL_DIR ]; then
167 167
         mkdir -p $INSTALL_DIR
168 168
     fi