From 061e65520d09f65771aacbfc53400fd23e09b64c Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 23 Oct 2016 19:38:14 +0100 Subject: [PATCH] Quieter install --- src/freedombone | 2 ++ src/freedombone-addcert | 2 +- src/freedombone-app-batman | 6 ++--- src/freedombone-app-dlna | 4 +-- src/freedombone-app-dokuwiki | 6 ++--- src/freedombone-app-emacs | 4 +-- src/freedombone-app-gnusocial | 8 +++--- src/freedombone-app-gogs | 4 +-- src/freedombone-app-htmly | 2 +- src/freedombone-app-hubzilla | 6 ++--- src/freedombone-app-ipfs | 16 ++++++------ src/freedombone-app-irc | 8 +++--- src/freedombone-app-librevault | 28 ++++++++++----------- src/freedombone-app-mediagoblin | 16 ++++++------ src/freedombone-app-mumble | 4 +-- src/freedombone-app-pelican | 4 +-- src/freedombone-app-pihole | 4 +-- src/freedombone-app-rss | 4 +-- src/freedombone-app-searx | 4 +-- src/freedombone-app-sip | 8 +++--- src/freedombone-app-syncthing | 6 ++--- src/freedombone-app-tahoelafs | 6 ++--- src/freedombone-app-tox | 32 ++++++++++++------------ src/freedombone-app-vim | 4 +-- src/freedombone-app-vpn | 4 +-- src/freedombone-app-webmail | 6 ++--- src/freedombone-app-xmpp | 10 ++++---- src/freedombone-app-zeronet | 4 +-- src/freedombone-base-email | 26 ++++++++++---------- src/freedombone-base-tripwire | 6 ++--- src/freedombone-client | 8 +++--- src/freedombone-config | 4 +-- src/freedombone-image | 8 +++--- src/freedombone-image-customise | 38 ++++++++++++++--------------- src/freedombone-mesh | 8 +++--- src/freedombone-mesh-install | 12 ++++----- src/freedombone-recoverkey | 2 +- src/freedombone-utils-avahi | 2 +- src/freedombone-utils-backup | 2 +- src/freedombone-utils-cmake | 4 +-- src/freedombone-utils-cryptopp | 4 +-- src/freedombone-utils-database | 14 +++++------ src/freedombone-utils-ffmpeg | 6 ++--- src/freedombone-utils-filesystem | 4 +-- src/freedombone-utils-final | 2 ++ src/freedombone-utils-go | 6 ++--- src/freedombone-utils-international | 2 +- src/freedombone-utils-monkeysphere | 2 +- src/freedombone-utils-nodejs | 8 +++--- src/freedombone-utils-onion | 6 ++--- src/freedombone-utils-passwords | 2 +- src/freedombone-utils-repos | 4 +-- src/freedombone-utils-rng | 8 +++--- src/freedombone-utils-setup | 26 ++++++++++---------- src/freedombone-utils-ssh | 2 +- src/freedombone-utils-time | 2 +- src/freedombone-utils-tracker | 4 +-- src/freedombone-utils-upgrade | 2 +- src/freedombone-utils-web | 12 ++++----- src/freedombone-utils-wifi | 2 +- 60 files changed, 227 insertions(+), 223 deletions(-) diff --git a/src/freedombone b/src/freedombone index 63a4acee..bf9adcce 100755 --- a/src/freedombone +++ b/src/freedombone @@ -311,6 +311,8 @@ echo '' echo $'Setting up the base installation' echo '' +export DEBIAN_FRONTEND=noninteractive + upgrade_installation_from_previous_versions setup_utils setup_email diff --git a/src/freedombone-addcert b/src/freedombone-addcert index 60ec956d..5018c638 100755 --- a/src/freedombone-addcert +++ b/src/freedombone-addcert @@ -196,7 +196,7 @@ function add_cert_letsencrypt { fi if [ ! -f /usr/bin/certbot ]; then - apt-get -y install certbot -t jessie-backports + apt-get -yq install certbot -t jessie-backports if [ ! -f /usr/bin/certbot ]; then echo $'LetsEncrypt certbot failed to install' exit 762830 diff --git a/src/freedombone-app-batman b/src/freedombone-app-batman index 75538fe0..edac4b3c 100755 --- a/src/freedombone-app-batman +++ b/src/freedombone-app-batman @@ -93,9 +93,9 @@ function remove_batman { } function mesh_install_batman { - chroot "$rootdir" apt-get -y install iproute bridge-utils libnetfilter-conntrack3 batctl - chroot "$rootdir" apt-get -y install python-dev libevent-dev ebtables python-pip git - chroot "$rootdir" apt-get -y install wireless-tools rfkill + chroot "$rootdir" apt-get -yq install iproute bridge-utils libnetfilter-conntrack3 batctl + chroot "$rootdir" apt-get -yq install python-dev libevent-dev ebtables python-pip git + chroot "$rootdir" apt-get -yq install wireless-tools rfkill if ! grep -q "batman_adv" $rootdir/etc/modules; then echo 'batman_adv' >> $rootdir/etc/modules diff --git a/src/freedombone-app-dlna b/src/freedombone-app-dlna index 74c04622..8e1775ec 100755 --- a/src/freedombone-app-dlna +++ b/src/freedombone-app-dlna @@ -154,7 +154,7 @@ function restore_remote_dlna { function remove_dlna { service minidlna stop - apt-get -y remove --purge minidlna + apt-get -yq remove --purge minidlna if [ -f /etc/minidlna.conf ]; then rm /etc/minidlna.conf fi @@ -168,7 +168,7 @@ function install_dlna_main { return fi - apt-get -y install minidlna + apt-get -yq install minidlna if [ ! -f /etc/minidlna.conf ]; then echo $"ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE" diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki index daffd0b5..6c7c20b6 100755 --- a/src/freedombone-app-dokuwiki +++ b/src/freedombone-app-dokuwiki @@ -177,7 +177,7 @@ function remove_dokuwiki { if [ -f /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME ]; then rm /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME fi - apt-get -y remove --purge dokuwiki + apt-get -yq remove --purge dokuwiki if [ ! -d /var/www/$DOKUWIKI_DOMAIN_NAME ]; then rm -rf /var/www/$DOKUWIKI_DOMAIN_NAME fi @@ -206,8 +206,8 @@ function install_dokuwiki { if [ ! $DOKUWIKI_DOMAIN_NAME ]; then return fi - apt-get -y install dokuwiki - apt-get -y remove --purge apache* + apt-get -yq install dokuwiki + apt-get -yq remove --purge apache* if [ -d /etc/apache2 ]; then rm -rf /etc/apache2 echo $'Removed Apache installation after Dokuwiki install' diff --git a/src/freedombone-app-emacs b/src/freedombone-app-emacs index 99667321..a047f898 100755 --- a/src/freedombone-app-emacs +++ b/src/freedombone-app-emacs @@ -136,7 +136,7 @@ function restore_remote_emacs { } function remove_emacs { - apt-get -y remove --purge emacs24 + apt-get -yq remove --purge emacs24 update-alternatives --set editor /usr/bin/nano sed -i '/install_emacs/d' $COMPLETION_FILE @@ -159,7 +159,7 @@ function remove_emacs { } function install_emacs { - apt-get -y install emacs24 + apt-get -yq install emacs24 update-alternatives --set editor /usr/bin/emacs24 # A minimal emacs configuration diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index 5dff24a9..198d62f0 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -510,8 +510,8 @@ function install_gnusocial_main { function_check repair_databases_script repair_databases_script - apt-get -y install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser - apt-get -y install php5-memcached php5-intl + apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser + apt-get -yq install php5-memcached php5-intl if [ ! -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then mkdir /var/www/$GNUSOCIAL_DOMAIN_NAME @@ -764,7 +764,7 @@ function install_gnusocial_plugin_sharings { exit 72945 fi - apt-get -y install liblocale-msgfmt-perl gettext + apt-get -yq install liblocale-msgfmt-perl gettext # update to the next commit function_check set_repo_commit @@ -937,7 +937,7 @@ function install_gnusocial_theme { return fi - apt-get -y install wget + apt-get -yq install wget if [ ! -d /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/local/plugins ]; then mkdir -p /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/local/plugins diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs index 02334c4b..46378e9c 100755 --- a/src/freedombone-app-gogs +++ b/src/freedombone-app-gogs @@ -158,7 +158,7 @@ function upgrade_gogs { if [ ! -f ${GOGS_FILE} ]; then exit 37836 else - apt-get -y install unzip + apt-get -yq install unzip unzip -o ${GOGS_FILE} fi else @@ -380,7 +380,7 @@ function install_gogs { if [ ! -f ${GOGS_FILE} ]; then exit 37836 else - apt-get -y install unzip + apt-get -yq install unzip unzip -o ${GOGS_FILE} fi else diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly index dc5549e4..3fed00ed 100755 --- a/src/freedombone-app-htmly +++ b/src/freedombone-app-htmly @@ -598,7 +598,7 @@ function install_htmly { fi # for the avatar changing command - apt-get -y install imagemagick + apt-get -yq install imagemagick function_check install_htmly_from_repo install_htmly_from_repo diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla index 98aa8aaf..e26f19d8 100755 --- a/src/freedombone-app-hubzilla +++ b/src/freedombone-app-hubzilla @@ -313,9 +313,9 @@ function install_hubzilla { function_check repair_databases_script repair_databases_script - apt-get -y install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git - apt-get -y install php5-dev imagemagick php5-imagick - apt-get -y install php5-memcached + apt-get -yq install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git + apt-get -yq install php5-dev imagemagick php5-imagick + apt-get -yq install php5-memcached if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then mkdir /var/www/$HUBZILLA_DOMAIN_NAME diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs index 89cfb152..4521c8e0 100755 --- a/src/freedombone-app-ipfs +++ b/src/freedombone-app-ipfs @@ -207,9 +207,9 @@ function mesh_install_ipfs_js { return fi - chroot ${rootdir} apt-get -y install nodejs - chroot ${rootdir} apt-get -y install npm curl - chroot ${rootdir} apt-get -y install libpam0g-dev fuse + chroot ${rootdir} apt-get -yq install nodejs + chroot ${rootdir} apt-get -yq install npm curl + chroot ${rootdir} apt-get -yq install libpam0g-dev fuse if [ ! -f ${rootdir}/usr/bin/nodejs ]; then echo $'nodejs was not installed' @@ -287,9 +287,9 @@ function install_ipfs_js { return fi - apt-get -y install nodejs - apt-get -y install npm - apt-get -y install libpam0g-dev fuse + apt-get -yq install nodejs + apt-get -yq install npm + apt-get -yq install libpam0g-dev fuse if [ ! -f /usr/bin/nodejs ]; then echo $'nodejs was not installed' @@ -377,7 +377,7 @@ function install_ipfs_js { } function mesh_install_ipfs_go { - chroot ${rootdir} apt-get -y install libpam0g-dev fuse wget + chroot ${rootdir} apt-get -yq install libpam0g-dev fuse wget mesh_upgrade_golang @@ -454,7 +454,7 @@ function install_ipfs_go { return fi - apt-get -y install golang libpam0g-dev fuse + apt-get -yq install golang libpam0g-dev fuse if [ ! -d /home/git ]; then # add a gogs user account diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc index c8642b84..e2da4e58 100755 --- a/src/freedombone-app-irc +++ b/src/freedombone-app-irc @@ -239,8 +239,8 @@ function restore_remote_irc { function remove_irc { remove_watchdog_daemon ngircd systemctl stop ngircd - apt-get -y remove --purge ngircd - apt-get -y remove --purge irssi + apt-get -yq remove --purge ngircd + apt-get -yq remove --purge irssi if [ -d /etc/ngircd ]; then rm -rf /etc/ngircd fi @@ -283,7 +283,7 @@ function install_irc_server { if [[ $(app_is_installed irc_server) == "1" ]]; then return fi - apt-get -y install ngircd + apt-get -yq install ngircd if [ ! -d /etc/ngircd ]; then echo $"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE" @@ -383,7 +383,7 @@ function install_irc_client { if [[ $(app_is_installed irc_client) == "1" ]]; then return fi - apt-get -y install irssi + apt-get -yq install irssi if [ ! -d /home/${MY_USERNAME}/.irssi ]; then mkdir /home/${MY_USERNAME}/.irssi diff --git a/src/freedombone-app-librevault b/src/freedombone-app-librevault index 69ed3ecb..6a39e5a7 100755 --- a/src/freedombone-app-librevault +++ b/src/freedombone-app-librevault @@ -130,18 +130,18 @@ function mesh_install_librevault { install_cmake install_cryptopp - chroot "$rootdir" apt-get -y install bittornado nginx - chroot "$rootdir" apt-get -y install build-essential - chroot "$rootdir" apt-get -y install autoconf automake libtool curl make unzip + chroot "$rootdir" apt-get -yq install bittornado nginx + chroot "$rootdir" apt-get -yq install build-essential + chroot "$rootdir" apt-get -yq install autoconf automake libtool curl make unzip # A workaround which allows c++14 to be installed sed -i 's|jessie|stretch|g' $rootdir/etc/apt/sources.list sed -i 's|stretch-backports|jessie-backports|g' $rootdir/etc/apt/sources.list chroot "$rootdir" apt-get update - chroot "$rootdir" apt-get -y install g++ gcc-6 g++-6 libboost-all-dev libssl-dev - chroot "$rootdir" apt-get -y install protobuf-compiler libprotobuf-dev - chroot "$rootdir" apt-get -y install qtbase5-dev libqt5svg5-dev libqt5websockets5-dev - chroot "$rootdir" apt-get -y install libsqlite3-dev qttools5-dev qttools5-dev-tools libnatpmp-dev + chroot "$rootdir" apt-get -yq install g++ gcc-6 g++-6 libboost-all-dev libssl-dev + chroot "$rootdir" apt-get -yq install protobuf-compiler libprotobuf-dev + chroot "$rootdir" apt-get -yq install qtbase5-dev libqt5svg5-dev libqt5websockets5-dev + chroot "$rootdir" apt-get -yq install libsqlite3-dev qttools5-dev qttools5-dev-tools libnatpmp-dev sed -i 's|stretch|jessie|g' $rootdir/etc/apt/sources.list chroot "$rootdir" apt-get update @@ -229,18 +229,18 @@ function install_librevault { install_cmake install_cryptopp - apt-get -y install build-essential - apt-get -y install autoconf automake libtool curl make unzip + apt-get -yq install build-essential + apt-get -yq install autoconf automake libtool curl make unzip # A workaround which allows c++14 to be installed sed -i 's|jessie|stretch|g' /etc/apt/sources.list sed -i 's|stretch-backports|jessie-backports|g' /etc/apt/sources.list apt-get update - apt-get -y install protobuf-compiler libprotobuf-dev - apt-get -y install g++ gcc-6 g++-6 libboost-all-dev libssl-dev - apt-get -y install qtbase5-dev libqt5svg5-dev libqt5websockets5-dev - apt-get -y install libsqlite3-dev qttools5-dev qttools5-dev-tools libnatpmp-dev - apt-get -y install gcc-6 g++-6 libboost-all-dev + apt-get -yq install protobuf-compiler libprotobuf-dev + apt-get -yq install g++ gcc-6 g++-6 libboost-all-dev libssl-dev + apt-get -yq install qtbase5-dev libqt5svg5-dev libqt5websockets5-dev + apt-get -yq install libsqlite3-dev qttools5-dev qttools5-dev-tools libnatpmp-dev + apt-get -yq install gcc-6 g++-6 libboost-all-dev sed -i 's|stretch|jessie|g' /etc/apt/sources.list apt-get update diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin index 1342dad3..a267de0c 100755 --- a/src/freedombone-app-mediagoblin +++ b/src/freedombone-app-mediagoblin @@ -187,15 +187,15 @@ function install_mediagoblin { chown -hR mediagoblin:www-data $MEDIAGOBLIN_WORKING_DIRECTORY fi - apt-get -y install git-core python python-dev python-lxml python-pil - apt-get -y install python-virtualenv npm nodejs-legacy automake - apt-get -y install fcgiwrap + apt-get -yq install git-core python python-dev python-lxml python-pil + apt-get -yq install python-virtualenv npm nodejs-legacy automake + apt-get -yq install fcgiwrap - #apt-get -y install postgresql postgresql-client python-psycopg2 - #apt-get -y install python-gst-1.0 libjpeg62-turbo-dev gstreamer1.0-plugins-base python-gobject - #apt-get -y install gstreamer1.0-plugins-good gstreamer1.0-libav libav-tools gstreamer0.10-tools - #apt-get -y install python-numpy python-scipy libsndfile1-dev python-gst0.10-dev - #apt-get -y install gstreamer0.10-plugins-base gstreamer0.10-plugins-good gstreamer1.0-tools + #apt-get -yq install postgresql postgresql-client python-psycopg2 + #apt-get -yq install python-gst-1.0 libjpeg62-turbo-dev gstreamer1.0-plugins-base python-gobject + #apt-get -yq install gstreamer1.0-plugins-good gstreamer1.0-libav libav-tools gstreamer0.10-tools + #apt-get -yq install python-numpy python-scipy libsndfile1-dev python-gst0.10-dev + #apt-get -yq install gstreamer0.10-plugins-base gstreamer0.10-plugins-good gstreamer1.0-tools #su -c "createuser -A -D mediagoblin" - postgres #su -c "createdb -E UNICODE -O mediagoblin mediagoblin" - postgres diff --git a/src/freedombone-app-mumble b/src/freedombone-app-mumble index 03c5284e..8f149ba3 100755 --- a/src/freedombone-app-mumble +++ b/src/freedombone-app-mumble @@ -156,7 +156,7 @@ function restore_remote_mumble { } function remove_mumble { - apt-get -y remove --purge mumble-server + apt-get -yq remove --purge mumble-server if [[ $ONION_ONLY == "no" ]]; then firewall_remove ${MUMBLE_PORT} fi @@ -191,7 +191,7 @@ function configure_firewall_for_mumble { } function install_mumble { - apt-get -y install mumble-server + apt-get -yq install mumble-server function_check get_mumble_server_password get_mumble_server_password diff --git a/src/freedombone-app-pelican b/src/freedombone-app-pelican index 789b0307..d7e16001 100755 --- a/src/freedombone-app-pelican +++ b/src/freedombone-app-pelican @@ -274,7 +274,7 @@ function mesh_install_pelican { return fi - chroot "$rootdir" apt-get -y install python-pip + chroot "$rootdir" apt-get -yq install python-pip chroot "$rootdir" pip install ipython chroot "$rootdir" pip install Markdown chroot "$rootdir" pip install typogrify @@ -315,7 +315,7 @@ function install_pelican { return fi - apt-get -y install python-pip + apt-get -yq install python-pip pip install ipython pip install Markdown pip install typogrify diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole index 3d4e1a0a..7e813923 100755 --- a/src/freedombone-app-pihole +++ b/src/freedombone-app-pihole @@ -288,7 +288,7 @@ function restore_remote_pihole { } function remove_pihole { - apt-get -y remove --purge dnsmasq + apt-get -yq remove --purge dnsmasq if [ ! -d /var/www/pihole ]; then rm -rf /var/www/pihole @@ -323,7 +323,7 @@ function remove_pihole { } function install_pihole { - apt-get -y install dnsmasq curl + apt-get -yq install dnsmasq curl adduser --disabled-login --gecos 'pi-hole' pihole usermod -a -G www-data pihole diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss index 49c9790e..e5ae3340 100755 --- a/src/freedombone-app-rss +++ b/src/freedombone-app-rss @@ -287,8 +287,8 @@ function rss_modifications { } function install_rss_main { - apt-get -y install php-gettext php5-curl php5-gd php5-mysql git - apt-get -y install curl php-xml-parser php5-mcrypt + apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git + apt-get -yq install curl php-xml-parser php5-mcrypt if [ ! -d /etc/share ]; then mkdir /etc/share diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx index 164b56fa..10d763fb 100755 --- a/src/freedombone-app-searx +++ b/src/freedombone-app-searx @@ -123,8 +123,8 @@ function install_searx { exit 62429 fi - apt-get -y install python-pip libyaml-dev python-werkzeug python-babel python-lxml apache2-utils - apt-get -y install git build-essential libxslt-dev python-dev python-virtualenv python-pybabel zlib1g-dev uwsgi uwsgi-plugin-python libapache2-mod-uwsgi + apt-get -yq install python-pip libyaml-dev python-werkzeug python-babel python-lxml apache2-utils + apt-get -yq install git build-essential libxslt-dev python-dev python-virtualenv python-pybabel zlib1g-dev uwsgi uwsgi-plugin-python libapache2-mod-uwsgi pip install --upgrade pip diff --git a/src/freedombone-app-sip b/src/freedombone-app-sip index 0db524c5..5d91c0cf 100755 --- a/src/freedombone-app-sip +++ b/src/freedombone-app-sip @@ -166,8 +166,8 @@ function remove_sip { function_check remove_onion_service remove_onion_service sip ${SIP_PORT} - apt-get -y remove --purge sipwitch - apt-get -y remove --purge turnserver + apt-get -yq remove --purge sipwitch + apt-get -yq remove --purge turnserver if [ -f /etc/sipwitch.conf ]; then rm /etc/sipwitch.conf fi @@ -256,7 +256,7 @@ function install_sip_main { return fi - apt-get -y install sipwitch + apt-get -yq install sipwitch function_check get_sip_server_password get_sip_server_password @@ -340,7 +340,7 @@ function install_sip_turn { return fi - apt-get -y install turnserver + apt-get -yq install turnserver # create a nonce if needed if [ ! $TURN_NONCE ]; then diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing index d4dc22d2..58e7bea2 100755 --- a/src/freedombone-app-syncthing +++ b/src/freedombone-app-syncthing @@ -465,7 +465,7 @@ function remove_syncthing { firewall_remove ${SYNCTHING_PORT} systemctl stop syncthing systemctl disable syncthing - apt-get -y remove --purge syncthing + apt-get -yq remove --purge syncthing rm /etc/systemd/system/syncthing.service sed -i "/${PROJECT_NAME}-syncthing/d" /etc/crontab remove_completion_param install_syncthing @@ -483,12 +483,12 @@ function configure_firewall_for_syncthing { } function install_syncthing { - apt-get -y install curl + apt-get -yq install curl curl -s https://syncthing.net/release-key.txt | apt-key add - echo "deb http://apt.syncthing.net/ syncthing release" | tee /etc/apt/sources.list.d/syncthing.list apt-get update - apt-get -y install syncthing + apt-get -yq install syncthing # This probably does need to run as root so that it can access the Sync directories # in each user's home directory diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs index 4cf0d450..0c0d50ad 100755 --- a/src/freedombone-app-tahoelafs +++ b/src/freedombone-app-tahoelafs @@ -261,8 +261,8 @@ function tahoelafs_update_script { } function mesh_install_tahoelafs { - chroot "$rootdir" apt-get -y install build-essential python-pip python-dev - chroot "$rootdir" apt-get -y install libffi-dev libssl-dev python-virtualenv + chroot "$rootdir" apt-get -yq install build-essential python-pip python-dev + chroot "$rootdir" apt-get -yq install libffi-dev libssl-dev python-virtualenv git clone $TAHOELAFS_REPO $rootdir/var/lib/tahoelafs cd $rootdir/var/lib/tahoelafs @@ -290,7 +290,7 @@ function install_tahoelafs { return fi - apt-get -y install build-essential python-pip python-dev libffi-dev libssl-dev python-virtualenv + apt-get -yq install build-essential python-pip python-dev libffi-dev libssl-dev python-virtualenv # create a user to run the introducer if [ ! -d /home/tahoelafs ]; then diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox index c886e08c..b5edbd89 100755 --- a/src/freedombone-app-tox +++ b/src/freedombone-app-tox @@ -119,8 +119,8 @@ function mesh_tox_qtox { mkdir -p ${rootdir}$INSTALL_DIR fi - 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 - 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 + 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 + 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 mesh_install_ffmpeg @@ -450,17 +450,17 @@ function mesh_tox_node { fi if [ $rootdir ]; then - chroot ${rootdir} apt-get -y install build-essential libtool autotools-dev - chroot ${rootdir} apt-get -y install automake checkinstall check git yasm - chroot ${rootdir} apt-get -y install libsodium13 libsodium-dev libcap2-bin - chroot ${rootdir} apt-get -y install libconfig9 libconfig-dev autoconf - chroot ${rootdir} apt-get -y install libopus-dev libvpx-dev + chroot ${rootdir} apt-get -yq install build-essential libtool autotools-dev + chroot ${rootdir} apt-get -yq install automake checkinstall check git yasm + chroot ${rootdir} apt-get -yq install libsodium13 libsodium-dev libcap2-bin + chroot ${rootdir} apt-get -yq install libconfig9 libconfig-dev autoconf + chroot ${rootdir} apt-get -yq install libopus-dev libvpx-dev else - apt-get -y install build-essential libtool autotools-dev - apt-get -y install automake checkinstall check git yasm - apt-get -y install libsodium13 libsodium-dev libcap2-bin - apt-get -y install libconfig9 libconfig-dev autoconf - apt-get -y install libopus-dev libvpx-dev + apt-get -yq install build-essential libtool autotools-dev + apt-get -yq install automake checkinstall check git yasm + apt-get -yq install libsodium13 libsodium-dev libcap2-bin + apt-get -yq install libconfig9 libconfig-dev autoconf + apt-get -yq install libopus-dev libvpx-dev fi if [ ! -d ${rootdir}${INSTALL_DIR} ]; then @@ -638,11 +638,11 @@ function mesh_tox_client { fi if [ ${rootdir} ]; then - chroot ${rootdir} apt-get -y install libncursesw5-dev libconfig-dev libqrencode-dev - chroot ${rootdir} apt-get -y install libcurl4-openssl-dev libvpx-dev libopenal-dev + chroot ${rootdir} apt-get -yq install libncursesw5-dev libconfig-dev libqrencode-dev + chroot ${rootdir} apt-get -yq install libcurl4-openssl-dev libvpx-dev libopenal-dev else - apt-get -y install libncursesw5-dev libconfig-dev libqrencode-dev - apt-get -y install libcurl4-openssl-dev libvpx-dev libopenal-dev + apt-get -yq install libncursesw5-dev libconfig-dev libqrencode-dev + apt-get -yq install libcurl4-openssl-dev libvpx-dev libopenal-dev fi TEMP_SCRIPT_NAME=fbtmp728353.sh diff --git a/src/freedombone-app-vim b/src/freedombone-app-vim index 1a09953b..d2bf2a24 100755 --- a/src/freedombone-app-vim +++ b/src/freedombone-app-vim @@ -187,7 +187,7 @@ function restore_remote_vim { } function remove_vim { - apt-get -y remove --purge vim + apt-get -yq remove --purge vim update-alternatives --set editor /usr/bin/nano sed -i '/install_vim/d' $COMPLETION_FILE @@ -210,7 +210,7 @@ function remove_vim { } function install_vim { - apt-get -y install vim + apt-get -yq install vim update-alternatives --set editor /usr/bin/vim # add a mutt entry to use Vim to compose emails diff --git a/src/freedombone-app-vpn b/src/freedombone-app-vpn index fec65b75..3292469d 100755 --- a/src/freedombone-app-vpn +++ b/src/freedombone-app-vpn @@ -66,7 +66,7 @@ function restore_remote_vpn { } function remove_vpn { - apt-get -y remove --purge fastd + apt-get -yq remove --purge fastd remove_completion_param install_vpn } @@ -79,7 +79,7 @@ function install_vpn { fi gpg -a --export 16EF3F64CB201D9C | sudo apt-key add - apt-get update - apt-get -y install fastd + apt-get -yq install fastd if [ ! "$?" = "0" ]; then exit 52026 fi diff --git a/src/freedombone-app-webmail b/src/freedombone-app-webmail index 47542deb..26ee65b9 100755 --- a/src/freedombone-app-webmail +++ b/src/freedombone-app-webmail @@ -156,9 +156,9 @@ function install_webmail { function_check repair_databases_script repair_databases_script - apt-get -y install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git - apt-get -y install php5-dev imagemagick php5-imagick php5-sqlite php-auth-sasl php-net-smtp php-mime-type - apt-get -y install php-mail-mime php-mail-mimedecode php-net-ldap3 php5-pspell + apt-get -yq install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git + apt-get -yq install php5-dev imagemagick php5-imagick php5-sqlite php-auth-sasl php-net-smtp php-mime-type + apt-get -yq install php-mail-mime php-mail-mimedecode php-net-ldap3 php5-pspell pear install Net_IDNA2 if [ ! -f $WEBMAIL_PATH/index.php ]; then diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp index 151dcc27..77ff62e8 100755 --- a/src/freedombone-app-xmpp +++ b/src/freedombone-app-xmpp @@ -260,7 +260,7 @@ function configure_firewall_for_xmpp { } function remove_xmpp_client { - apt-get -y remove --purge profanity + apt-get -yq remove --purge profanity remove_completion_param install_xmpp_client remove_certs xmpp } @@ -276,7 +276,7 @@ function remove_xmpp { function_check remove_onion_service remove_onion_service xmpp 5222 5223 5269 - apt-get -y remove --purge prosody prosody-modules + apt-get -yq remove --purge prosody prosody-modules if [ -d $INSTALL_DIR/prosody-modules ]; then rm -rf $INSTALL_DIR/prosody-modules fi @@ -307,8 +307,8 @@ function install_xmpp_main { if [[ $(app_is_installed xmpp_main) == "1" ]]; then return fi - apt-get -y install lua-sec lua-bitop - apt-get -y install prosody prosody-modules mercurial + apt-get -yq install lua-sec lua-bitop + apt-get -yq install prosody prosody-modules mercurial if [ ! -d /etc/prosody ]; then echo $"ERROR: prosody does not appear to have installed. $CHECK_MESSAGE" @@ -479,7 +479,7 @@ function install_xmpp_client { if [[ $(app_is_installed xmpp_client) == "1" ]]; then return fi - apt-get -y install profanity + apt-get -yq install profanity XMPP_CLIENT_DIR=/home/$MY_USERNAME/.local/share/profanity XMPP_CLIENT_ACCOUNTS=$XMPP_CLIENT_DIR/accounts diff --git a/src/freedombone-app-zeronet b/src/freedombone-app-zeronet index 92a5fcbf..98022eda 100755 --- a/src/freedombone-app-zeronet +++ b/src/freedombone-app-zeronet @@ -475,8 +475,8 @@ function mesh_zeronet { exit 432052 fi - chroot "$rootdir" apt-get -y install python python-msgpack python-gevent - chroot "$rootdir" apt-get -y install python-pip bittornado + chroot "$rootdir" apt-get -yq install python python-msgpack python-gevent + chroot "$rootdir" apt-get -yq install python-pip bittornado chroot "$rootdir" pip install msgpack-python --upgrade chroot "$rootdir" useradd -d $MESH_INSTALL_DIR/zeronet/ -s /bin/false zeronet diff --git a/src/freedombone-base-email b/src/freedombone-base-email index 5e2285bc..028d5858 100755 --- a/src/freedombone-base-email +++ b/src/freedombone-base-email @@ -122,7 +122,7 @@ function encrypt_incoming_email { fi if [ ! -f /usr/bin/gpgit.pl ]; then - apt-get -y install git libmail-gnupg-perl + apt-get -yq install git libmail-gnupg-perl cd $INSTALL_DIR function_check git_clone git_clone $GPGIT_REPO $INSTALL_DIR/gpgit @@ -245,7 +245,7 @@ function email_client { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install mutt-patched lynx abook + apt-get -yq install mutt-patched lynx abook if [ ! -f /etc/Muttrc ]; then echo $"ERROR: Mutt does not appear to have installed. $CHECK_MESSAGE" @@ -439,7 +439,7 @@ function create_public_mailing_list { PUBLIC_MAILING_LIST_USER="mlmmj" - apt-get -y install mlmmj + apt-get -yq install mlmmj adduser --system $PUBLIC_MAILING_LIST_USER addgroup $PUBLIC_MAILING_LIST_USER adduser $PUBLIC_MAILING_LIST_USER $PUBLIC_MAILING_LIST_USER @@ -541,7 +541,7 @@ function create_private_mailing_list { echo $'the top of the script' exit 11 fi - apt-get -y install ruby ruby-dev ruby-gpgme libgpgme11-dev libmagic-dev + apt-get -yq install ruby ruby-dev ruby-gpgme libgpgme11-dev libmagic-dev gem install schleuder schleuder-fix-gem-dependencies schleuder-init-setup --gem @@ -664,8 +664,8 @@ function remove_email { } function install_email_with_tor { - apt-get -y remove postfix - apt-get -y install exim4 sasl2-bin swaks libnet-ssleay-perl procmail xinetd + apt-get -yq remove postfix + apt-get -yq install exim4 sasl2-bin swaks libnet-ssleay-perl procmail xinetd if [ ! -d /etc/exim4 ]; then echo $"ERROR: Exim does not appear to have installed. $CHECK_MESSAGE" @@ -896,8 +896,8 @@ function install_email_with_tor { } function install_email_basic { - apt-get -y remove postfix - apt-get -y install exim4 sasl2-bin swaks libnet-ssleay-perl procmail + apt-get -yq remove postfix + apt-get -yq install exim4 sasl2-bin swaks libnet-ssleay-perl procmail if [ ! -d /etc/exim4 ]; then echo $"ERROR: Exim does not appear to have installed. $CHECK_MESSAGE" @@ -1062,8 +1062,8 @@ function spam_filtering { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install exim4-daemon-heavy - apt-get -y install spamassassin + apt-get -yq install exim4-daemon-heavy + apt-get -yq install spamassassin if [ ! -f /etc/default/spamassassin ]; then echo 'Spamassassin was not installed' exit 72570 @@ -1226,7 +1226,7 @@ function configure_imap { dpkg -P dovecot-imapd dpkg -P dovecot-core - apt-get -y install dovecot-imapd + apt-get -yq install dovecot-imapd if [ ! -d /etc/dovecot ]; then echo $"ERROR: Dovecot does not appear to have installed. $CHECK_MESSAGE" @@ -1394,7 +1394,7 @@ function create_gpg_subkey { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install gnupg + apt-get -yq install gnupg GPG_KEY_USAGE=$1 if [[ $GPG_KEY_USAGE != "sign" && $GPG_KEY_USAGE != "auth" && $GPG_KEY_USAGE != "encrypt" ]]; then @@ -1462,7 +1462,7 @@ function configure_gpg { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install gnupg + apt-get -yq install gnupg gpg_dir=/home/$MY_USERNAME/.gnupg diff --git a/src/freedombone-base-tripwire b/src/freedombone-base-tripwire index b02d98d5..a6410a3e 100755 --- a/src/freedombone-base-tripwire +++ b/src/freedombone-base-tripwire @@ -40,7 +40,7 @@ function remove_tripwire { if ! grep -Fxq "tripwire" $COMPLETION_FILE; then return fi - apt-get -y remove --purge tripwire + apt-get -yq remove --purge tripwire if [ -d /etc/tripwire ]; then rm -rf /etc/tripwire fi @@ -52,8 +52,8 @@ function install_tripwire { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install tripwire - apt-get -y autoremove + apt-get -yq install tripwire + apt-get -yq autoremove cd /etc/tripwire cp site.key $DEFAULT_DOMAIN_NAME-site.key echo '*** Installing intrusion detection ***' diff --git a/src/freedombone-client b/src/freedombone-client index 862e433d..7e1c5574 100755 --- a/src/freedombone-client +++ b/src/freedombone-client @@ -86,7 +86,7 @@ function global_rate_limit { function refresh_gpg_keys { if [ ! -f /usr/bin/gpg ]; then if [ ! -f /usr/bin/pacman ]; then - sudo apt-get -y install gnupg + sudo apt-get -yq install gnupg else sudo pacman -S --noconfirm gnupg fi @@ -111,7 +111,7 @@ function configure_ssh_client { if [ -f /usr/bin/pacman ]; then sudo pacman --noconfirm -S openbsd-netcat else - sudo apt-get -y install tor connect-proxy + sudo apt-get -yq install tor connect-proxy fi #sudo sed -i 's/# PasswordAuthentication.*/ PasswordAuthentication no/g' /etc/ssh/ssh_config @@ -192,7 +192,7 @@ function configure_monkeysphere { if [ -f /usr/bin/pacman ]; then return fi - sudo apt-get -y install monkeysphere + sudo apt-get -yq install monkeysphere } function show_help { @@ -241,7 +241,7 @@ configure_monkeysphere if [[ $MESH_CLIENT_INSTALL == $'yes' || $MESH_CLIENT_INSTALL == $'y' || $MESH_CLIENT_INSTALL == $'on' ]]; then echo $'Installing mesh packages' if [ ! -f /usr/bin/pacman ]; then - sudo apt-get -y install avahi-utils avahi-autoipd avahi-dnsconfd + sudo apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd else sudo pacman -S --noconfirm avahi nss-mdns sudo sed -i 's|hosts:.*|hosts: files mdns_minimal [NOTFOUND=return] dns myhostname|g' /etc/nsswitch.conf diff --git a/src/freedombone-config b/src/freedombone-config index 07fe6ab5..7a2eae9b 100755 --- a/src/freedombone-config +++ b/src/freedombone-config @@ -890,7 +890,7 @@ function interactive_gpg_from_remote { fi # try to recover the key from the servers - apt-get -y install libgfshare-bin gnupg + apt-get -yq install libgfshare-bin gnupg ${PROJECT_NAME}-recoverkey -u $MY_USERNAME -l $REMOTE_SERVERS_LIST if [ ! "$?" = "0" ]; then dialog --title $"Encryption keys" --msgbox $'Your key could not be recovered' 6 70 @@ -912,7 +912,7 @@ function reconstruct_key { dialog --title $"Encryption keys" --msgbox $'Not enough fragments to reconstruct the key' 6 70 exit 7348 fi - apt-get -y install libgfshare-bin gnupg + apt-get -yq install libgfshare-bin gnupg gfcombine /home/$MY_USERNAME/.gnupg_fragments/keyshare* if [ ! "$?" = "0" ]; then dialog --title $"Encryption keys" --msgbox $'Unable to reconstruct the key' 6 70 diff --git a/src/freedombone-image b/src/freedombone-image index c72000e3..dce936f9 100755 --- a/src/freedombone-image +++ b/src/freedombone-image @@ -134,10 +134,10 @@ function image_setup { case $setup_type in debian|ubuntu|trisquel|mint) - sudo apt-get -y install build-essential libc6-dev-i386 gcc-multilib g++-multilib - sudo apt-get -y install git python-docutils mktorrent vmdebootstrap xz-utils - sudo apt-get -y install dosfstools btrfs-tools extlinux python-distro-info mbr - sudo apt-get -y install qemu-user-static binfmt-support u-boot-tools qemu + sudo apt-get -yq install build-essential libc6-dev-i386 gcc-multilib g++-multilib + sudo apt-get -yq install git python-docutils mktorrent vmdebootstrap xz-utils + sudo apt-get -yq install dosfstools btrfs-tools extlinux python-distro-info mbr + sudo apt-get -yq install qemu-user-static binfmt-support u-boot-tools qemu ;; parabola|arch) sudo pacman -S --noconfirm libc++ git gcc gcc-libs python-docutils mktorrent patch diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 4106f7ee..82738507 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -569,7 +569,7 @@ initialise_mesh() { # install proprietary wifi drivers # see https://wiki.debian.org/iwlwifi - chroot "$rootdir" apt-get -y install firmware-iwlwifi firmware-b43-installer firmware-brcm80211 + chroot "$rootdir" apt-get -yq install firmware-iwlwifi firmware-b43-installer firmware-brcm80211 fi INSTALLING_MESH=1 @@ -735,37 +735,37 @@ function configure_user_interface { fi # desktop - chroot "$rootdir" apt-get -y install mate-desktop-environment + chroot "$rootdir" apt-get -yq install mate-desktop-environment # tool to change desktop settings from command line - chroot "$rootdir" apt-get -y install dconf-cli dconf-gsettings-backend dbus dbus-x11 + chroot "$rootdir" apt-get -yq install dconf-cli dconf-gsettings-backend dbus dbus-x11 # for tomb - chroot "$rootdir" apt-get -y install pinentry-gtk2 + chroot "$rootdir" apt-get -yq install pinentry-gtk2 # for tox video - chroot "$rootdir" apt-get -y install ffmpeg cheese v4l-utils + chroot "$rootdir" apt-get -yq install ffmpeg cheese v4l-utils # to provide notifications - chroot "$rootdir" apt-get -y install libnotify-bin + chroot "$rootdir" apt-get -yq install libnotify-bin # for video/audio - chroot "$rootdir" apt-get -y install libtheora-bin libvorbis-dev v4l-utils + chroot "$rootdir" apt-get -yq install libtheora-bin libvorbis-dev v4l-utils # a sane editor - chroot "$rootdir" apt-get -y install emacs24 + chroot "$rootdir" apt-get -yq install emacs24 # for wifi monitoring - chroot "$rootdir" apt-get -y install horst + chroot "$rootdir" apt-get -yq install horst # for sound level control - chroot "$rootdir" apt-get -y install alsa-utils + chroot "$rootdir" apt-get -yq install alsa-utils # to play various media types - chroot "$rootdir" apt-get -y install vlc + chroot "$rootdir" apt-get -yq install vlc # android adb to allow phones to be connected and for example transfer photos/documents - chroot "$rootdir" apt-get -y install android-tools-adb + chroot "$rootdir" apt-get -yq install android-tools-adb # Produce a text file on the desktop listing users on the mesh cat < $rootdir/usr/bin/list-tox-users @@ -903,11 +903,11 @@ EOF fi fi else - chroot "$rootdir" apt-get -y install lightdm + chroot "$rootdir" apt-get -yq install lightdm fi # browser - chroot "$rootdir" apt-get -y install $BROWSER + chroot "$rootdir" apt-get -yq install $BROWSER # help mkdir -p $rootdir/home/${MY_USERNAME}/help/images @@ -932,15 +932,15 @@ EOF # xmpp client chroot "$rootdir" echo "deb ftp://ftp.gajim.org/debian unstable main" > /etc/apt/sources.list.d/gajim.list chroot "$rootdir" apt-get update - chroot "$rootdir" apt-get -y install gajim-dev-keyring - chroot "$rootdir" apt-get -y install git python-dev python-pip gajim-nightly + chroot "$rootdir" apt-get -yq install gajim-dev-keyring + chroot "$rootdir" apt-get -yq install git python-dev python-pip gajim-nightly chroot "$rootdir" mkdir /home/$GENERIC_IMAGE_USERNAME/.local/share/gajim/plugins -p chroot "$rootdir" git clone https://github.com/omemo/gajim-omemo /home/$GENERIC_IMAGE_USERNAME/.local/share/gajim/plugins/gajim-omemo chroot "$rootdir" pip install protobuf==2.6.1, python-axolotl==0.1.35 chroot "$rootdir" /bin/chown -R $GENERIC_IMAGE_USERNAME:$GENERIC_IMAGE_USERNAME /home/$GENERIC_IMAGE_USERNAME/.local # IRC client - chroot "$rootdir" apt-get -y install hexchat profanity + chroot "$rootdir" apt-get -yq install hexchat profanity fi } @@ -1043,9 +1043,9 @@ rm $rootdir/usr/sbin/policy-rc.d # Set up HRNG for systems known to have one # Otherwise install haveged if [[ "$MACHINE" != "beaglebone" ]]; then - chroot $rootdir apt-get -y install haveged + chroot $rootdir apt-get -yq install haveged else - chroot $rootdir apt-get -y install rng-tools + chroot $rootdir apt-get -yq install rng-tools sed -i 's|#HRNGDEVICE=/dev/hwrng|HRNGDEVICE=/dev/hwrng|g' $rootdir/etc/default/rng-tools fi diff --git a/src/freedombone-mesh b/src/freedombone-mesh index c523f63d..fb0e9ca5 100755 --- a/src/freedombone-mesh +++ b/src/freedombone-mesh @@ -69,10 +69,10 @@ function install_toxcore { return fi - sudo apt-get -y install build-essential libtool autotools-dev - sudo apt-get -y install automake checkinstall check git yasm - sudo apt-get -y install libsodium13 libsodium-dev libcap2-bin - sudo apt-get -y install libconfig9 libconfig-dev + sudo apt-get -yq install build-essential libtool autotools-dev + sudo apt-get -yq install automake checkinstall check git yasm + sudo apt-get -yq install libsodium13 libsodium-dev libcap2-bin + sudo apt-get -yq install libconfig9 libconfig-dev if [ ! -d ~/develop ]; then mkdir ~/develop diff --git a/src/freedombone-mesh-install b/src/freedombone-mesh-install index 7cc5e193..1c317211 100755 --- a/src/freedombone-mesh-install +++ b/src/freedombone-mesh-install @@ -93,7 +93,7 @@ function show_help { } function mesh_avahi { - $CHROOT_PREFIX apt-get -y install avahi-utils avahi-autoipd avahi-dnsconfd + $CHROOT_PREFIX apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd decarray=( 1 2 3 4 5 6 7 8 9 0 ) 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 { } function install_batman { - $CHROOT_PREFIX apt-get -y install iproute bridge-utils libnetfilter-conntrack3 batctl - $CHROOT_PREFIX apt-get -y install python-dev libevent-dev ebtables python-pip git - $CHROOT_PREFIX apt-get -y install wireless-tools rfkill + $CHROOT_PREFIX apt-get -yq install iproute bridge-utils libnetfilter-conntrack3 batctl + $CHROOT_PREFIX apt-get -yq install python-dev libevent-dev ebtables python-pip git + $CHROOT_PREFIX apt-get -yq install wireless-tools rfkill if ! grep -q "batman_adv" $rootdir/etc/modules; then echo 'batman_adv' >> $rootdir/etc/modules @@ -241,13 +241,13 @@ function enable_tox_repo { function mesh_tox_client_qtox { enable_tox_repo - sudo apt-get -y install qtox + sudo apt-get -yq install qtox echo "qTox Installed." } function mesh_tox_client_toxic_from_repo { enable_tox_repo - sudo apt-get -y install toxic + sudo apt-get -yq install toxic echo "Toxic Installed." } diff --git a/src/freedombone-recoverkey b/src/freedombone-recoverkey index d84ede0a..476a4033 100755 --- a/src/freedombone-recoverkey +++ b/src/freedombone-recoverkey @@ -118,7 +118,7 @@ function reconstruct_key { dialog --title $"Encryption keys" --msgbox $'Not enough fragments to reconstruct the key' 6 70 exit 7348 fi - apt-get -y install libgfshare-bin gnupg + apt-get -yq install libgfshare-bin gnupg gfcombine /home/$MY_USERNAME/.gnupg_fragments/keyshare* if [ ! "$?" = "0" ]; then dialog --title $"Encryption keys" --msgbox $'Unable to reconstruct the key' 6 70 diff --git a/src/freedombone-utils-avahi b/src/freedombone-utils-avahi index 705dada4..3a046361 100755 --- a/src/freedombone-utils-avahi +++ b/src/freedombone-utils-avahi @@ -55,7 +55,7 @@ function create_avahi_service { } function mesh_avahi { - chroot "$rootdir" apt-get -y install avahi-utils avahi-autoipd avahi-dnsconfd + chroot "$rootdir" apt-get -yq install avahi-utils avahi-autoipd avahi-dnsconfd decarray=( 1 2 3 4 5 6 7 8 9 0 ) 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]} diff --git a/src/freedombone-utils-backup b/src/freedombone-utils-backup index cec42b00..55aec6cc 100755 --- a/src/freedombone-utils-backup +++ b/src/freedombone-utils-backup @@ -52,7 +52,7 @@ function configure_backup_key { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install gnupg + apt-get -yq install gnupg BACKUP_KEY_EXISTS=$(gpg_key_exists "root" "$MY_NAME (backup key)") if [[ $BACKUP_KEY_EXISTS == "yes" ]]; then diff --git a/src/freedombone-utils-cmake b/src/freedombone-utils-cmake index 50a3fc6d..b54e37dc 100755 --- a/src/freedombone-utils-cmake +++ b/src/freedombone-utils-cmake @@ -36,7 +36,7 @@ function mesh_install_cmake { chroot "$rootdir" mkdir -p $INSTALL_DIR fi - chroot "$rootdir" apt-get -y install build-essential + chroot "$rootdir" apt-get -yq install build-essential git clone $CMAKE_REPO $rootdir$INSTALL_DIR/cmake cd $rootdir$INSTALL_DIR/cmake @@ -83,7 +83,7 @@ function install_cmake { mkdir -p $INSTALL_DIR fi - apt-get -y install build-essential + apt-get -yq install build-essential git_clone $CMAKE_REPO $INSTALL_DIR/cmake cd $INSTALL_DIR/cmake diff --git a/src/freedombone-utils-cryptopp b/src/freedombone-utils-cryptopp index 88c33a1f..5b0894c6 100755 --- a/src/freedombone-utils-cryptopp +++ b/src/freedombone-utils-cryptopp @@ -36,7 +36,7 @@ function mesh_install_cryptopp { chroot "$rootdir" mkdir -p $INSTALL_DIR fi - chroot "$rootdir" apt-get -y install build-essential + chroot "$rootdir" apt-get -yq install build-essential git clone $CRYPTOPP_REPO $rootdir$INSTALL_DIR/cryptopp cd $rootdir$INSTALL_DIR/cryptopp @@ -84,7 +84,7 @@ function install_cryptopp { mkdir -p $INSTALL_DIR fi - apt-get -y install build-essential + apt-get -yq install build-essential git_clone $CRYPTOPP_REPO $INSTALL_DIR/cryptopp cd $INSTALL_DIR/cryptopp diff --git a/src/freedombone-utils-database b/src/freedombone-utils-database index 622e491a..5cb5dd12 100755 --- a/src/freedombone-utils-database +++ b/src/freedombone-utils-database @@ -120,9 +120,9 @@ function install_mariadb { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install python-software-properties debconf-utils - apt-get -y install software-properties-common - apt-get -y update + apt-get -yq install python-software-properties debconf-utils + apt-get -yq install software-properties-common + apt-get -yq update function_check get_mariadb_password get_mariadb_password @@ -147,8 +147,8 @@ function install_mariadb { debconf-set-selections <<< "mariadb-server mariadb-server/root_password password $MARIADB_PASSWORD" debconf-set-selections <<< "mariadb-server mariadb-server/root_password_again password $MARIADB_PASSWORD" - apt-get -y install mariadb-server - apt-get -y remove --purge apache* + apt-get -yq install mariadb-server + apt-get -yq remove --purge apache* if [ -d /etc/apache2 ]; then rm -rf /etc/apache2 echo $'Removed Apache installation after MariaDB install' @@ -278,10 +278,10 @@ function drop_database { } function database_reinstall { - apt-get -y purge mariadb* + apt-get -yq purge mariadb* rm -rf /var/lib/mysql rm -rf /etc/mysql - apt-get -y install mariadb-server + apt-get -yq install mariadb-server } # NOTE: deliberately there is no "exit 0" diff --git a/src/freedombone-utils-ffmpeg b/src/freedombone-utils-ffmpeg index fda7f212..e7e40721 100755 --- a/src/freedombone-utils-ffmpeg +++ b/src/freedombone-utils-ffmpeg @@ -32,9 +32,9 @@ FFMPEG_VERSION=3.1.2 function mesh_install_ffmpeg { - chroot "${rootdir}" apt-get -y remove ffmpeg libav-tools - chroot "${rootdir}" apt-get -y install build-essential - 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 + chroot "${rootdir}" apt-get -yq remove ffmpeg libav-tools + chroot "${rootdir}" apt-get -yq install build-essential + 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 mkdir -p ${rootdir}$INSTALL_DIR/ffmpeg-release cd ${rootdir}$INSTALL_DIR wget http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 diff --git a/src/freedombone-utils-filesystem b/src/freedombone-utils-filesystem index 0a441b16..6536c2c2 100755 --- a/src/freedombone-utils-filesystem +++ b/src/freedombone-utils-filesystem @@ -32,7 +32,7 @@ TOMB_REPO="https://github.com/dyne/Tomb" TOMB_COMMIT='c80ebd6d6ed77980eb5b559757e03ea13a29bdd1' function mesh_install_tomb { - chroot ${rootdir} apt-get -y install cryptsetup zsh pinentry-curses + chroot ${rootdir} apt-get -yq install cryptsetup zsh pinentry-curses if [ ! -d ${rootdir}/$INSTALL_DIR ]; then mkdir -p ${rootdir}/$INSTALL_DIR @@ -67,7 +67,7 @@ function install_tomb { fi fi - apt-get -y install cryptsetup zsh pinentry-curses + apt-get -yq install cryptsetup zsh pinentry-curses if [ ! -d $INSTALL_DIR ]; then mkdir -p $INSTALL_DIR diff --git a/src/freedombone-utils-final b/src/freedombone-utils-final index 9231fa02..8407757a 100755 --- a/src/freedombone-utils-final +++ b/src/freedombone-utils-final @@ -86,6 +86,8 @@ function setup_final { function_check install_final install_final + + export DEBIAN_FRONTEND= } # NOTE: deliberately no exit 0 diff --git a/src/freedombone-utils-go b/src/freedombone-utils-go index de4a81ff..b673e45e 100755 --- a/src/freedombone-utils-go +++ b/src/freedombone-utils-go @@ -77,9 +77,9 @@ function mesh_upgrade_golang_from_source { cat < ${rootdir}/root/upgrade_golang.sh #!/bin/bash -apt-get -y install build-essential libc6-dev -apt-get -y install gcc-multilib g++-multilib make -apt-get -y install curl git mercurial binutils bison +apt-get -yq install build-essential libc6-dev +apt-get -yq install gcc-multilib g++-multilib make +apt-get -yq install curl git mercurial binutils bison if [ -d /home/go/Maildir ]; then rm -rf /home/go/Maildir diff --git a/src/freedombone-utils-international b/src/freedombone-utils-international index 2943ae73..dc8616ab 100755 --- a/src/freedombone-utils-international +++ b/src/freedombone-utils-international @@ -33,7 +33,7 @@ function locale_setup { return fi - apt-get -y install locales locales-all debconf + apt-get -yq install locales locales-all debconf if [ ! "$DEFAULT_LANGUAGE" ]; then DEFAULT_LANGUAGE='en_GB.UTF-8' diff --git a/src/freedombone-utils-monkeysphere b/src/freedombone-utils-monkeysphere index 6c2d24c0..a2969fff 100755 --- a/src/freedombone-utils-monkeysphere +++ b/src/freedombone-utils-monkeysphere @@ -32,7 +32,7 @@ function install_monkeysphere { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install monkeysphere msva-perl + apt-get -yq install monkeysphere msva-perl #su -c "monkeysphere gen-subkey $MY_GPG_PUBLIC_KEY_ID" - $MY_USERNAME mkdir /home/$MY_USERNAME/.monkeysphere chmod 755 /home/$MY_USERNAME/.monkeysphere diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs index 17624c46..dd6eeb4a 100755 --- a/src/freedombone-utils-nodejs +++ b/src/freedombone-utils-nodejs @@ -37,8 +37,8 @@ NODEJS_VERSION='6.2.2' NODEJS_N_VERSION='2.1.4' function mesh_install_nodejs { - chroot "${rootdir}" apt-get -y install nodejs - chroot "${rootdir}" apt-get -y install npm curl + chroot "${rootdir}" apt-get -yq install nodejs + chroot "${rootdir}" apt-get -yq install npm curl if [ ! -f ${rootdir}/usr/bin/nodejs ]; then echo $'nodejs was not installed' @@ -74,8 +74,8 @@ function install_nodejs { return fi - apt-get -y install nodejs - apt-get -y install npm curl + apt-get -yq install nodejs + apt-get -yq install npm curl if [ ! -f /usr/bin/nodejs ]; then echo $'nodejs was not installed' diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion index 989b273b..c8653fad 100755 --- a/src/freedombone-utils-onion +++ b/src/freedombone-utils-onion @@ -191,7 +191,7 @@ function enable_ssh_via_onion { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install tor connect-proxy + apt-get -yq install tor connect-proxy if ! grep -q 'Host *.onion' /home/$MY_USERNAME/.ssh/config; then if [ ! -d /home/$MY_USERNAME/.ssh ]; then mkdir /home/$MY_USERNAME/.ssh @@ -233,7 +233,7 @@ function install_tor { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install tor + apt-get -yq install tor if [ ! -f /etc/tor/torrc ]; then echo 'Tor failed to install' exit 38259 @@ -282,7 +282,7 @@ function route_outgoing_traffic_through_tor { if [[ $ROUTE_THROUGH_TOR != "yes" ]]; then return fi - apt-get -y install tor tor-arm + apt-get -yq install tor tor-arm ### set variables # Destinations you don't want routed through Tor diff --git a/src/freedombone-utils-passwords b/src/freedombone-utils-passwords index ee5cb586..2a4c7b59 100755 --- a/src/freedombone-utils-passwords +++ b/src/freedombone-utils-passwords @@ -44,7 +44,7 @@ function enforce_good_passwords { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install libpam-cracklib + apt-get -yq install libpam-cracklib 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 mark_completed $FUNCNAME diff --git a/src/freedombone-utils-repos b/src/freedombone-utils-repos index a379cd97..7062ecd5 100755 --- a/src/freedombone-utils-repos +++ b/src/freedombone-utils-repos @@ -58,7 +58,7 @@ function create_repo_sources { echo "deb-src http://${DEBIAN_REPO}/debian/ ${DEBIAN_VERSION}-backports main" >> /etc/apt/sources.list apt-get update - apt-get -y install apt-transport-https + apt-get -yq install apt-transport-https mark_completed $FUNCNAME } @@ -108,7 +108,7 @@ function create_git_project { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install git + apt-get -yq install git echo '#!/bin/bash' > /usr/bin/$CREATE_GIT_PROJECT_COMMAND echo '' >> /usr/bin/$CREATE_GIT_PROJECT_COMMAND diff --git a/src/freedombone-utils-rng b/src/freedombone-utils-rng index 30e1a9fa..ee54c892 100755 --- a/src/freedombone-utils-rng +++ b/src/freedombone-utils-rng @@ -77,12 +77,12 @@ function check_onerng_verification { fi echo $'OneRNG firmware verification passed' # if haveged was previously installed then remove it - apt-get -y remove haveged + apt-get -yq remove haveged mark_completed $FUNCNAME } function install_onerng { - apt-get -y install rng-tools at python-gnupg + apt-get -yq install rng-tools at python-gnupg # Move to the installation directory if [ ! -d $INSTALL_DIR ]; then @@ -149,7 +149,7 @@ function random_number_generator { case $HWRNG_TYPE in beaglebone) - apt-get -y install rng-tools + apt-get -yq install rng-tools sed -i 's|#HRNGDEVICE=/dev/hwrng|HRNGDEVICE=/dev/hwrng|g' /etc/default/rng-tools ;; onerng) @@ -157,7 +157,7 @@ function random_number_generator { install_onerng ;; *) - apt-get -y install haveged + apt-get -yq install haveged ;; esac diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup index 23d9ead7..f22660e0 100755 --- a/src/freedombone-utils-setup +++ b/src/freedombone-utils-setup @@ -111,19 +111,19 @@ function initial_setup { return fi - apt-get -y remove --purge apache* - apt-get -y dist-upgrade - apt-get -y install ca-certificates - apt-get -y install apt-utils - apt-get -y install cryptsetup libgfshare-bin obnam sshpass wget avahi-daemon - apt-get -y install avahi-utils avahi-discover connect-proxy openssh-server - apt-get -y install sudo git dialog build-essential avahi-daemon avahi-utils - apt-get -y install avahi-discover avahi-autoipd iptables dnsutils net-tools - apt-get -y install network-manager iputils-ping libnss-mdns libnss-myhostname - apt-get -y install libnss-gw-name nano man ntp locales locales-all debconf - apt-get -y install wireless-tools wpasupplicant usbutils cryptsetup zsh - apt-get -y install pinentry-curses eatmydata iotop bc grub2 hostapd haveged - apt-get -y install cpulimit + apt-get -yq remove --purge apache* + apt-get -yq dist-upgrade + apt-get -yq install ca-certificates + apt-get -yq install apt-utils + apt-get -yq install cryptsetup libgfshare-bin obnam sshpass wget avahi-daemon + apt-get -yq install avahi-utils avahi-discover connect-proxy openssh-server + apt-get -yq install sudo git dialog build-essential avahi-daemon avahi-utils + apt-get -yq install avahi-discover avahi-autoipd iptables dnsutils net-tools + apt-get -yq install network-manager iputils-ping libnss-mdns libnss-myhostname + apt-get -yq install libnss-gw-name nano man ntp locales locales-all debconf + apt-get -yq install wireless-tools wpasupplicant usbutils cryptsetup zsh + apt-get -yq install pinentry-curses eatmydata iotop bc grub2 hostapd haveged + apt-get -yq install cpulimit if [ ! -d $INSTALL_DIR ]; then mkdir -p $INSTALL_DIR diff --git a/src/freedombone-utils-ssh b/src/freedombone-utils-ssh index a660fc26..d417383f 100755 --- a/src/freedombone-utils-ssh +++ b/src/freedombone-utils-ssh @@ -78,7 +78,7 @@ function configure_ssh { echo "KexAlgorithms $SSH_KEX" >> /etc/ssh/sshd_config fi - apt-get -y install fail2ban + apt-get -yq install fail2ban function_check configure_firewall_for_ssh configure_firewall_for_ssh diff --git a/src/freedombone-utils-time b/src/freedombone-utils-time index bea5215f..e6486748 100755 --- a/src/freedombone-utils-time +++ b/src/freedombone-utils-time @@ -31,7 +31,7 @@ function check_date { curr_date=$(date) if [[ $curr_date == *"1970"* ]]; then - apt-get -y install ntp + apt-get -yq install ntp fi } diff --git a/src/freedombone-utils-tracker b/src/freedombone-utils-tracker index 67d404df..2553d221 100755 --- a/src/freedombone-utils-tracker +++ b/src/freedombone-utils-tracker @@ -31,7 +31,7 @@ TRACKER_PORT=6969 function mesh_install_tracker { - chroot "$rootdir" apt-get -y install bittornado nginx + chroot "$rootdir" apt-get -yq install bittornado nginx TRACKER_DAEMON=$rootdir/etc/systemd/system/tracker.service echo '[Unit]' > $TRACKER_DAEMON @@ -69,7 +69,7 @@ function install_tracker { return fi - apt-get -y install bittornado nginx + apt-get -yq install bittornado nginx TRACKER_DAEMON=/etc/systemd/system/tracker.service echo '[Unit]' > $TRACKER_DAEMON diff --git a/src/freedombone-utils-upgrade b/src/freedombone-utils-upgrade index 3ab84bfb..e6dc9144 100755 --- a/src/freedombone-utils-upgrade +++ b/src/freedombone-utils-upgrade @@ -42,7 +42,7 @@ function create_upgrade_script { return fi - apt-get -y install unattended-upgrades + apt-get -yq install unattended-upgrades mark_completed $FUNCNAME } diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web index d4b1b216..e2c0d5e4 100755 --- a/src/freedombone-utils-web +++ b/src/freedombone-utils-web @@ -350,7 +350,7 @@ function install_dynamicdns { # Debian version 1.99.4-1 # https version 1.99.8 - apt-get -y install build-essential curl libgnutls28-dev automake1.11 + apt-get -yq install build-essential curl libgnutls28-dev automake1.11 if [ ! -d $INSTALL_DIR/inadyn ]; then git_clone $INADYN_REPO $INSTALL_DIR/inadyn fi @@ -410,7 +410,7 @@ function install_command_line_browser { if [[ $(is_completed $FUNCNAME) == "1" ]]; then return fi - apt-get -y install elinks + apt-get -yq install elinks # set the home page if ! grep -q "WWW_HOME" /home/$MY_USERNAME/.bashrc; then @@ -426,11 +426,11 @@ function install_command_line_browser { function mesh_web_server { if [ -d /etc/apache2 ]; then - chroot "$rootdir" apt-get -y remove --purge apache2 + chroot "$rootdir" apt-get -yq remove --purge apache2 chroot "$rootdir" rm -rf /etc/apache2 fi - chroot "$rootdir" apt-get -y install nginx + chroot "$rootdir" apt-get -yq install nginx if [ ! -d $rootdir/etc/nginx ]; then echo $'Unable to install web server' @@ -452,12 +452,12 @@ function install_web_server { return fi # remove apache - apt-get -y remove --purge apache2 + apt-get -yq remove --purge apache2 if [ -d /etc/apache2 ]; then rm -rf /etc/apache2 fi # install nginx - apt-get -y install nginx php5-fpm git + apt-get -yq install nginx php5-fpm git # limit the number of php processes sed -i 's/; process.max =.*/process.max = 32/g' /etc/php5/fpm/php-fpm.conf diff --git a/src/freedombone-utils-wifi b/src/freedombone-utils-wifi index ede106a0..65e34ad2 100755 --- a/src/freedombone-utils-wifi +++ b/src/freedombone-utils-wifi @@ -162,7 +162,7 @@ function install_atheros_wifi { if [ -f /lib/firmware/htc_9271.fw ]; then return fi - apt-get -y install build-essential cmake git m4 texinfo + apt-get -yq install build-essential cmake git m4 texinfo if [ ! -d $INSTALL_DIR ]; then mkdir -p $INSTALL_DIR fi