Browse Source

Remove unsafe option --force-yes

Bob Mottram 10 years ago
parent
commit
f99b293962
1 changed files with 41 additions and 41 deletions
  1. 41
    41
      src/freedombone

+ 41
- 41
src/freedombone View File

1824
   if grep -Fxq "create_backup_script" $COMPLETION_FILE; then
1824
   if grep -Fxq "create_backup_script" $COMPLETION_FILE; then
1825
       return
1825
       return
1826
   fi
1826
   fi
1827
-  apt-get -y --force-yes install rsyncrypto
1827
+  apt-get -y install rsyncrypto
1828
 
1828
 
1829
   get_mariadb_password
1829
   get_mariadb_password
1830
   get_mariadb_gnusocial_admin_password
1830
   get_mariadb_gnusocial_admin_password
2333
   if grep -Fxq "create_restore_script" $COMPLETION_FILE; then
2333
   if grep -Fxq "create_restore_script" $COMPLETION_FILE; then
2334
       return
2334
       return
2335
   fi
2335
   fi
2336
-  apt-get -y --force-yes install rsyncrypto
2336
+  apt-get -y install rsyncrypto
2337
 
2337
 
2338
   get_mariadb_password
2338
   get_mariadb_password
2339
   get_mariadb_gnusocial_admin_password
2339
   get_mariadb_gnusocial_admin_password
2904
       return
2904
       return
2905
   fi
2905
   fi
2906
 
2906
 
2907
-  apt-get -y --force-yes install rsyncrypto sshpass
2907
+  apt-get -y install rsyncrypto sshpass
2908
 
2908
 
2909
   get_mariadb_password
2909
   get_mariadb_password
2910
   get_mariadb_gnusocial_admin_password
2910
   get_mariadb_gnusocial_admin_password
3545
       return
3545
       return
3546
   fi
3546
   fi
3547
 
3547
 
3548
-  apt-get -y --force-yes install rsyncrypto sshpass
3548
+  apt-get -y install rsyncrypto sshpass
3549
 
3549
 
3550
   get_mariadb_password
3550
   get_mariadb_password
3551
   get_mariadb_gnusocial_admin_password
3551
   get_mariadb_gnusocial_admin_password
4085
   if grep -Fxq "enforce_good_passwords" $COMPLETION_FILE; then
4085
   if grep -Fxq "enforce_good_passwords" $COMPLETION_FILE; then
4086
       return
4086
       return
4087
   fi
4087
   fi
4088
-  apt-get -y --force-yes install libpam-cracklib
4088
+  apt-get -y install libpam-cracklib
4089
 
4089
 
4090
   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
4090
   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
4091
   echo 'enforce_good_passwords' >> $COMPLETION_FILE
4091
   echo 'enforce_good_passwords' >> $COMPLETION_FILE
4304
   fi
4304
   fi
4305
 
4305
 
4306
   apt-get update
4306
   apt-get update
4307
-  apt-get -y --force-yes install apt-transport-https
4307
+  apt-get -y install apt-transport-https
4308
   echo 'change_debian_repos' >> $COMPLETION_FILE
4308
   echo 'change_debian_repos' >> $COMPLETION_FILE
4309
 }
4309
 }
4310
 
4310
 
4515
       # On systems which are not beaglebones assume that
4515
       # On systems which are not beaglebones assume that
4516
       # no hardware random number generator is available
4516
       # no hardware random number generator is available
4517
       # and use the second best option
4517
       # and use the second best option
4518
-      apt-get -y --force-yes install haveged
4518
+      apt-get -y install haveged
4519
       return
4519
       return
4520
   fi
4520
   fi
4521
   if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
4521
   if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
4524
       return
4524
       return
4525
   fi
4525
   fi
4526
   if [[ $USE_HWRNG == "yes" ]]; then
4526
   if [[ $USE_HWRNG == "yes" ]]; then
4527
-    apt-get -y --force-yes install rng-tools
4527
+    apt-get -y install rng-tools
4528
     sed -i 's|#HRNGDEVICE=/dev/hwrng|HRNGDEVICE=/dev/hwrng|g' /etc/default/rng-tools
4528
     sed -i 's|#HRNGDEVICE=/dev/hwrng|HRNGDEVICE=/dev/hwrng|g' /etc/default/rng-tools
4529
   else
4529
   else
4530
-    apt-get -y --force-yes install haveged
4530
+    apt-get -y install haveged
4531
   fi
4531
   fi
4532
   echo 'random_number_generator' >> $COMPLETION_FILE
4532
   echo 'random_number_generator' >> $COMPLETION_FILE
4533
 }
4533
 }
4569
       echo "KexAlgorithms $SSH_KEX" >> /etc/ssh/sshd_config
4569
       echo "KexAlgorithms $SSH_KEX" >> /etc/ssh/sshd_config
4570
   fi
4570
   fi
4571
 
4571
 
4572
-  apt-get -y --force-yes install fail2ban
4572
+  apt-get -y install fail2ban
4573
   echo 'configure_ssh' >> $COMPLETION_FILE
4573
   echo 'configure_ssh' >> $COMPLETION_FILE
4574
   # Don't reboot if installing within docker
4574
   # Don't reboot if installing within docker
4575
   # random numbers will come from the host system
4575
   # random numbers will come from the host system
4661
   if grep -Fxq "time_synchronisation" $COMPLETION_FILE; then
4661
   if grep -Fxq "time_synchronisation" $COMPLETION_FILE; then
4662
       return
4662
       return
4663
   fi
4663
   fi
4664
-  #apt-get -y --force-yes install tlsdate
4664
+  #apt-get -y install tlsdate
4665
 
4665
 
4666
   # building tlsdate from source is a workaround because of
4666
   # building tlsdate from source is a workaround because of
4667
   # this bug https://github.com/ioerror/tlsdate/issues/130
4667
   # this bug https://github.com/ioerror/tlsdate/issues/130
4668
-  apt-get -y --force-yes install build-essential automake git pkg-config autoconf libtool libssl-dev libevent-dev
4668
+  apt-get -y install build-essential automake git pkg-config autoconf libtool libssl-dev libevent-dev
4669
 
4669
 
4670
   if [ ! -d $INSTALL_DIR ]; then
4670
   if [ ! -d $INSTALL_DIR ]; then
4671
       mkdir $INSTALL_DIR
4671
       mkdir $INSTALL_DIR
5088
       return
5088
       return
5089
   fi
5089
   fi
5090
   apt-get -y remove postfix
5090
   apt-get -y remove postfix
5091
-  apt-get -y --force-yes install exim4 sasl2-bin swaks libnet-ssleay-perl procmail
5091
+  apt-get -y install exim4 sasl2-bin swaks libnet-ssleay-perl procmail
5092
 
5092
 
5093
   if [ ! -d /etc/exim4 ]; then
5093
   if [ ! -d /etc/exim4 ]; then
5094
       echo "ERROR: Exim does not appear to have installed. $CHECK_MESSAGE"
5094
       echo "ERROR: Exim does not appear to have installed. $CHECK_MESSAGE"
5211
   if grep -Fxq "spam_filtering" $COMPLETION_FILE; then
5211
   if grep -Fxq "spam_filtering" $COMPLETION_FILE; then
5212
       return
5212
       return
5213
   fi
5213
   fi
5214
-  apt-get -y --force-yes install exim4-daemon-heavy
5215
-  apt-get -y --force-yes install spamassassin
5214
+  apt-get -y install exim4-daemon-heavy
5215
+  apt-get -y install spamassassin
5216
   sa-update -v
5216
   sa-update -v
5217
   sed -i 's/ENABLED=0/ENABLED=1/g' /etc/default/spamassassin
5217
   sed -i 's/ENABLED=0/ENABLED=1/g' /etc/default/spamassassin
5218
   sed -i 's/# spamd_address = 127.0.0.1 783/spamd_address = 127.0.0.1 783/g' /etc/exim4/exim4.conf.template
5218
   sed -i 's/# spamd_address = 127.0.0.1 783/spamd_address = 127.0.0.1 783/g' /etc/exim4/exim4.conf.template
5306
   if grep -Fxq "configure_imap" $COMPLETION_FILE; then
5306
   if grep -Fxq "configure_imap" $COMPLETION_FILE; then
5307
       return
5307
       return
5308
   fi
5308
   fi
5309
-  apt-get -y --force-yes install dovecot-common dovecot-imapd
5309
+  apt-get -y install dovecot-common dovecot-imapd
5310
 
5310
 
5311
   if [ ! -d /etc/dovecot ]; then
5311
   if [ ! -d /etc/dovecot ]; then
5312
       echo "ERROR: Dovecot does not appear to have installed. $CHECK_MESSAGE"
5312
       echo "ERROR: Dovecot does not appear to have installed. $CHECK_MESSAGE"
5344
   if grep -Fxq "configure_gpg" $COMPLETION_FILE; then
5344
   if grep -Fxq "configure_gpg" $COMPLETION_FILE; then
5345
       return
5345
       return
5346
   fi
5346
   fi
5347
-  apt-get -y --force-yes install gnupg
5347
+  apt-get -y install gnupg
5348
 
5348
 
5349
   # if gpg keys directory was previously imported from usb
5349
   # if gpg keys directory was previously imported from usb
5350
   if [[ $GPG_KEYS_IMPORTED == "yes" && -d /home/$MY_USERNAME/.gnupg ]]; then
5350
   if [[ $GPG_KEYS_IMPORTED == "yes" && -d /home/$MY_USERNAME/.gnupg ]]; then
5449
       return
5449
       return
5450
   fi
5450
   fi
5451
   if [ ! -f /usr/bin/gpgit.pl ]; then
5451
   if [ ! -f /usr/bin/gpgit.pl ]; then
5452
-      apt-get -y --force-yes install git libmail-gnupg-perl
5452
+      apt-get -y install git libmail-gnupg-perl
5453
       cd $INSTALL_DIR
5453
       cd $INSTALL_DIR
5454
       git clone https://github.com/mikecardwell/gpgit
5454
       git clone https://github.com/mikecardwell/gpgit
5455
       cd gpgit
5455
       cd gpgit
5637
   if grep -Fxq "email_client" $COMPLETION_FILE; then
5637
   if grep -Fxq "email_client" $COMPLETION_FILE; then
5638
       return
5638
       return
5639
   fi
5639
   fi
5640
-  apt-get -y --force-yes install mutt-patched lynx abook
5640
+  apt-get -y install mutt-patched lynx abook
5641
 
5641
 
5642
   if [ ! -f /etc/Muttrc ]; then
5642
   if [ ! -f /etc/Muttrc ]; then
5643
       echo "ERROR: Mutt does not appear to have installed. $CHECK_MESSAGE"
5643
       echo "ERROR: Mutt does not appear to have installed. $CHECK_MESSAGE"
5922
 
5922
 
5923
   PUBLIC_MAILING_LIST_USER="mlmmj"
5923
   PUBLIC_MAILING_LIST_USER="mlmmj"
5924
 
5924
 
5925
-  apt-get -y --force-yes install mlmmj
5925
+  apt-get -y install mlmmj
5926
   adduser --system $PUBLIC_MAILING_LIST_USER
5926
   adduser --system $PUBLIC_MAILING_LIST_USER
5927
   addgroup $PUBLIC_MAILING_LIST_USER
5927
   addgroup $PUBLIC_MAILING_LIST_USER
5928
   adduser $PUBLIC_MAILING_LIST_USER $PUBLIC_MAILING_LIST_USER
5928
   adduser $PUBLIC_MAILING_LIST_USER $PUBLIC_MAILING_LIST_USER
6024
       echo 'the top of the script'
6024
       echo 'the top of the script'
6025
       exit 11
6025
       exit 11
6026
   fi
6026
   fi
6027
-  apt-get -y --force-yes install ruby ruby-dev ruby-gpgme libgpgme11-dev libmagic-dev
6027
+  apt-get -y install ruby ruby-dev ruby-gpgme libgpgme11-dev libmagic-dev
6028
   gem install schleuder
6028
   gem install schleuder
6029
   schleuder-fix-gem-dependencies
6029
   schleuder-fix-gem-dependencies
6030
   schleuder-init-setup --gem
6030
   schleuder-init-setup --gem
6126
     rm -rf /etc/apache2
6126
     rm -rf /etc/apache2
6127
   fi
6127
   fi
6128
   # install nginx
6128
   # install nginx
6129
-  apt-get -y --force-yes install nginx php5-fpm git
6129
+  apt-get -y install nginx php5-fpm git
6130
 
6130
 
6131
   # limit the number of php processes
6131
   # limit the number of php processes
6132
   sed -i 's/; process.max = 128/process.max = 32/g' /etc/php5/fpm/php-fpm.conf
6132
   sed -i 's/; process.max = 128/process.max = 32/g' /etc/php5/fpm/php-fpm.conf
6247
   if grep -Fxq "install_mariadb" $COMPLETION_FILE; then
6247
   if grep -Fxq "install_mariadb" $COMPLETION_FILE; then
6248
       return
6248
       return
6249
   fi
6249
   fi
6250
-  apt-get -y --force-yes install python-software-properties debconf-utils
6251
-  apt-get -y --force-yes install software-properties-common
6250
+  apt-get -y install python-software-properties debconf-utils
6251
+  apt-get -y install software-properties-common
6252
   apt-get -y update
6252
   apt-get -y update
6253
 
6253
 
6254
   get_mariadb_password
6254
   get_mariadb_password
6268
 
6268
 
6269
   debconf-set-selections <<< "mariadb-server mariadb-server/root_password password $MARIADB_PASSWORD"
6269
   debconf-set-selections <<< "mariadb-server mariadb-server/root_password password $MARIADB_PASSWORD"
6270
   debconf-set-selections <<< "mariadb-server mariadb-server/root_password_again password $MARIADB_PASSWORD"
6270
   debconf-set-selections <<< "mariadb-server mariadb-server/root_password_again password $MARIADB_PASSWORD"
6271
-  apt-get -y --force-yes install mariadb-server
6271
+  apt-get -y install mariadb-server
6272
 
6272
 
6273
   if [ ! -d /etc/mysql ]; then
6273
   if [ ! -d /etc/mysql ]; then
6274
       echo "ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE"
6274
       echo "ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE"
6485
           exit 6746
6485
           exit 6746
6486
       fi
6486
       fi
6487
   fi
6487
   fi
6488
-  apt-get -y --force-yes install owncloud
6488
+  apt-get -y install owncloud
6489
   install_mariadb
6489
   install_mariadb
6490
   get_mariadb_password
6490
   get_mariadb_password
6491
 
6491
 
6696
   if grep -Fxq "install_xmpp" $COMPLETION_FILE; then
6696
   if grep -Fxq "install_xmpp" $COMPLETION_FILE; then
6697
       return
6697
       return
6698
   fi
6698
   fi
6699
-  apt-get -y --force-yes install prosody
6699
+  apt-get -y install prosody
6700
 
6700
 
6701
   if [ ! -d /etc/prosody ]; then
6701
   if [ ! -d /etc/prosody ]; then
6702
       echo "ERROR: prosody does not appear to have installed. $CHECK_MESSAGE"
6702
       echo "ERROR: prosody does not appear to have installed. $CHECK_MESSAGE"
6820
   if grep -Fxq "install_irc_server" $COMPLETION_FILE; then
6820
   if grep -Fxq "install_irc_server" $COMPLETION_FILE; then
6821
       return
6821
       return
6822
   fi
6822
   fi
6823
-  apt-get -y --force-yes install ngircd
6823
+  apt-get -y install ngircd
6824
 
6824
 
6825
   if [ ! -d /etc/ngircd ]; then
6825
   if [ ! -d /etc/ngircd ]; then
6826
       echo "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE"
6826
       echo "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE"
6908
   if [ ! $WIKI_DOMAIN_NAME ]; then
6908
   if [ ! $WIKI_DOMAIN_NAME ]; then
6909
       return
6909
       return
6910
   fi
6910
   fi
6911
-  apt-get -y --force-yes install dokuwiki
6911
+  apt-get -y install dokuwiki
6912
 
6912
 
6913
   if [ ! -d /var/www/$WIKI_DOMAIN_NAME ]; then
6913
   if [ ! -d /var/www/$WIKI_DOMAIN_NAME ]; then
6914
       mkdir /var/www/$WIKI_DOMAIN_NAME
6914
       mkdir /var/www/$WIKI_DOMAIN_NAME
7433
   get_mariadb_password
7433
   get_mariadb_password
7434
   repair_databases_script
7434
   repair_databases_script
7435
 
7435
 
7436
-  apt-get -y --force-yes install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
7436
+  apt-get -y install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
7437
 
7437
 
7438
   if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME ]; then
7438
   if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME ]; then
7439
       mkdir /var/www/$MICROBLOG_DOMAIN_NAME
7439
       mkdir /var/www/$MICROBLOG_DOMAIN_NAME
7679
   get_mariadb_password
7679
   get_mariadb_password
7680
   repair_databases_script
7680
   repair_databases_script
7681
 
7681
 
7682
-  apt-get -y --force-yes install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git
7682
+  apt-get -y install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git
7683
 
7683
 
7684
   if [ ! -d /var/www/$REDMATRIX_DOMAIN_NAME ]; then
7684
   if [ ! -d /var/www/$REDMATRIX_DOMAIN_NAME ]; then
7685
       mkdir /var/www/$REDMATRIX_DOMAIN_NAME
7685
       mkdir /var/www/$REDMATRIX_DOMAIN_NAME
7975
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" ]]; then
7975
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" ]]; then
7976
       return
7976
       return
7977
   fi
7977
   fi
7978
-  apt-get -y --force-yes install minidlna
7978
+  apt-get -y install minidlna
7979
 
7979
 
7980
   if [ ! -f /etc/minidlna.conf ]; then
7980
   if [ ! -f /etc/minidlna.conf ]; then
7981
       echo "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE"
7981
       echo "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE"
8034
   if [ ! $MEDIAGOBLIN_DOMAIN_NAME ]; then
8034
   if [ ! $MEDIAGOBLIN_DOMAIN_NAME ]; then
8035
       return
8035
       return
8036
   fi
8036
   fi
8037
-  apt-get -y --force-yes install git-core python python-dev python-lxml python-imaging python-virtualenv
8038
-  apt-get -y --force-yes install python-gst-1.0 libjpeg8-dev sqlite3 libapache2-mod-fcgid gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-libav python-numpy python-scipy libsndfile1-dev
8039
-  apt-get -y --force-yes install postgresql postgresql-client python-psycopg2 python-pip autotools-dev automake
8037
+  apt-get -y install git-core python python-dev python-lxml python-imaging python-virtualenv
8038
+  apt-get -y install python-gst-1.0 libjpeg8-dev sqlite3 libapache2-mod-fcgid gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-libav python-numpy python-scipy libsndfile1-dev
8039
+  apt-get -y install postgresql postgresql-client python-psycopg2 python-pip autotools-dev automake
8040
 
8040
 
8041
   sudo -u postgres createuser -A -D mediagoblin
8041
   sudo -u postgres createuser -A -D mediagoblin
8042
   sudo -u postgres createdb -E UNICODE -O mediagoblin mediagoblin
8042
   sudo -u postgres createdb -E UNICODE -O mediagoblin mediagoblin
8071
   add_ddns_domain
8071
   add_ddns_domain
8072
 
8072
 
8073
   # see https://wiki.mediagoblin.org/Deployment / uwsgi with configs
8073
   # see https://wiki.mediagoblin.org/Deployment / uwsgi with configs
8074
-  apt-get -y --force-yes install uwsgi uwsgi-plugin-python nginx-full supervisor
8074
+  apt-get -y install uwsgi uwsgi-plugin-python nginx-full supervisor
8075
 
8075
 
8076
   echo 'server {' > /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8076
   echo 'server {' > /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8077
   echo '        include /etc/nginx/mime.types;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8077
   echo '        include /etc/nginx/mime.types;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
8214
   echo '#!/bin/bash' > /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8214
   echo '#!/bin/bash' > /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8215
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8215
   echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8216
   echo 'apt-get -y update' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8216
   echo 'apt-get -y update' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8217
-  echo 'apt-get -y --force-yes upgrade' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8217
+  echo 'apt-get -y upgrade' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8218
   if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
8218
   if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
8219
       echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8219
       echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8220
       echo '# Red Matrix' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8220
       echo '# Red Matrix' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
8271
   if grep -Fxq "intrusion_detection" $COMPLETION_FILE; then
8271
   if grep -Fxq "intrusion_detection" $COMPLETION_FILE; then
8272
       return
8272
       return
8273
   fi
8273
   fi
8274
-  apt-get -y --force-yes install tripwire
8275
-  apt-get -y --force-yes autoremove
8274
+  apt-get -y install tripwire
8275
+  apt-get -y autoremove
8276
   cd /etc/tripwire
8276
   cd /etc/tripwire
8277
   cp site.key $DOMAIN_NAME-site.key
8277
   cp site.key $DOMAIN_NAME-site.key
8278
   echo ''
8278
   echo ''
8306
       return
8306
       return
8307
   fi
8307
   fi
8308
 
8308
 
8309
-  apt-get -y --force-yes install tor tor-arm
8309
+  apt-get -y install tor tor-arm
8310
 
8310
 
8311
   # firewall
8311
   # firewall
8312
   iptables -A INPUT -i usb0 -p tcp --dport 9050 -j ACCEPT
8312
   iptables -A INPUT -i usb0 -p tcp --dport 9050 -j ACCEPT
8371
   if [[ $ROUTE_THROUGH_TOR != "yes" ]]; then
8371
   if [[ $ROUTE_THROUGH_TOR != "yes" ]]; then
8372
       return
8372
       return
8373
   fi
8373
   fi
8374
-  apt-get -y --force-yes install tor tor-arm
8374
+  apt-get -y install tor tor-arm
8375
 
8375
 
8376
   ### set variables
8376
   ### set variables
8377
   # Destinations you don't want routed through Tor
8377
   # Destinations you don't want routed through Tor