From 5de7b0cf29429131a7042b759381fc306d9dd066 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 27 Jul 2016 20:51:57 +0100 Subject: [PATCH] Removing tox settings as a function --- src/freedombone-image-mesh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh index bae1af56..ea9ce84b 100755 --- a/src/freedombone-image-mesh +++ b/src/freedombone-image-mesh @@ -465,6 +465,16 @@ function configure_zeronet_id { echo $'Update of ZeroID completed' >> $INSTALL_LOG } +function amnesic_remove_tox { + echo $'Clearing qtox client settings' >> $INSTALL_LOG + if [ -d /home/${MY_USERNAME}/.config/tox ]; then + shred -zu /home/${MY_USERNAME}/.config/tox/*.tox + shred -zu /home/${MY_USERNAME}/.config/tox/*.db + shred -zu /home/${MY_USERNAME}/.config/tox/*.ini + rm -rf /home/${MY_USERNAME}/.config/tox + fi +} + function configure_toxcore { echo $'Configuring toxcore' >> $INSTALL_LOG @@ -491,13 +501,7 @@ function configure_toxcore { echo "$TOX_PUBLIC_KEY" > $TOX_BOOTSTRAP_ID_FILE echo $'Configured toxcore' >> $INSTALL_LOG - echo $'Clearing toxic client settings' >> $INSTALL_LOG - if [ -d /home/${MY_USERNAME}/.config/tox ]; then - shred -zu /home/${MY_USERNAME}/.config/tox/*.tox - shred -zu /home/${MY_USERNAME}/.config/tox/*.db - shred -zu /home/${MY_USERNAME}/.config/tox/*.ini - rm -rf /home/${MY_USERNAME}/.config/tox - fi + amnesic_remove_tox echo $'toxic client configured' >> $INSTALL_LOG } @@ -537,6 +541,8 @@ function mesh_amnesic { echo '#!/bin/bash' > /usr/bin/amnesic echo '' >> /usr/bin/amnesic + echo "shred -zu /var/log/${PROJECT_NAME}*" >> /usr/bin/amnesic + echo '' >> /usr/bin/amnesic echo 'MY_USERNAME=$1' >> /usr/bin/amnesic echo -n "${PROJECT_NAME}-image-mesh " >> /usr/bin/amnesic echo '$MY_USERNAME amnesic' >> /usr/bin/amnesic