free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidying

This commit is contained in:
Bob Mottram 2016-10-16 20:00:20 +01:00
parent 607d4bdc95
commit 31300402d4
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone-app-gnusocial
View File

@ -208,7 +208,7 @@ function gnusocial_create_database {
} }
function gnusocial_running_script { function gnusocial_running_script {
if ! grep -Fxq "install_gnusocial" $COMPLETION_FILE; then if [[ $(is_completed $FUNCNAME) == "1" ]]; then
return return
fi fi

2
src/freedombone-app-irc
View File

@ -256,7 +256,7 @@ function configure_firewall_for_irc {
if [ ! -d /etc/ngircd ]; then if [ ! -d /etc/ngircd ]; then
return return
fi fi
if grep -Fxq "configure_firewall_for_irc" ${COMPLETION_FILE}; then if [[ $(is_completed $FUNCNAME) == "1" ]]; then
return return
fi fi
if [[ ${INSTALLED_WITHIN_DOCKER} == "yes" ]]; then if [[ ${INSTALLED_WITHIN_DOCKER} == "yes" ]]; then

8
src/freedombone-app-rss
View File

@ -114,7 +114,7 @@ function upgrade_rss {
# remove any previous install # remove any previous install
if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then
if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then if [[ $(is_completed "install_rss_mobile_reader") == "1" ]]; then
sed -i '/install_rss_mobile_reader/d' $COMPLETION_FILE sed -i '/install_rss_mobile_reader/d' $COMPLETION_FILE
sed -i '/rss mobile reader commit/d' $COMPLETION_FILE sed -i '/rss mobile reader commit/d' $COMPLETION_FILE
rm -rf $RSS_READER_PATH/g2ttree-mobile rm -rf $RSS_READER_PATH/g2ttree-mobile
@ -523,7 +523,7 @@ function install_rss_gnusocial {
set_repo_commit $RSS_READER_GNUSOCIAL_PATH "rss reader gnusocial commit" "$RSS_READER_GNUSOCIAL_COMMIT" $RSS_READER_GNUSOCIAL_REPO set_repo_commit $RSS_READER_GNUSOCIAL_PATH "rss reader gnusocial commit" "$RSS_READER_GNUSOCIAL_COMMIT" $RSS_READER_GNUSOCIAL_REPO
chown -R www-data:www-data $RSS_READER_GNUSOCIAL_PATH chown -R www-data:www-data $RSS_READER_GNUSOCIAL_PATH
if grep -Fxq "install_rss_gnusocial" $COMPLETION_FILE; then if [[ $(is_completed $FUNCNAME) == "1" ]]; then
return return
fi fi
@ -560,14 +560,14 @@ function install_rss_mobile_reader {
# remove any previous install # remove any previous install
if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then if [ -d $RSS_READER_PATH/g2ttree-mobile ]; then
if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then if [[ $(is_completed "install_rss_mobile_reader") == "1" ]]; then
sed -i '/install_rss_mobile_reader/d' $COMPLETION_FILE sed -i '/install_rss_mobile_reader/d' $COMPLETION_FILE
sed -i '/rss mobile reader commit/d' $COMPLETION_FILE sed -i '/rss mobile reader commit/d' $COMPLETION_FILE
rm -rf $RSS_READER_PATH/g2ttree-mobile rm -rf $RSS_READER_PATH/g2ttree-mobile
fi fi
fi fi
if grep -Fxq "install_rss_mobile_reader" $COMPLETION_FILE; then if [[ $(is_completed $FUNCNAME) == "1" ]]; then
return return
fi fi

6
src/freedombone-base-email
View File

@ -248,7 +248,7 @@ function email_client {
if [ ! -d /etc/exim4 ]; then if [ ! -d /etc/exim4 ]; then
return return
fi fi
if grep -Fxq "email_client" $COMPLETION_FILE; then if [[ $(is_completed $FUNCNAME) == "1" ]]; then
return return
fi fi
apt-get -y install mutt-patched lynx abook apt-get -y install mutt-patched lynx abook
@ -607,7 +607,7 @@ function import_email {
Now on your internet router forward ports Now on your internet router forward ports
25, 587, 465, 993 and 2222 to the ${PROJECT_NAME} 25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}
" "
if grep -Fxq "import_email" $COMPLETION_FILE; then if [[ $(is_completed $FUNCNAME) == "1" ]]; then
if [[ $SYSTEM_TYPE == "mail"* ]]; then if [[ $SYSTEM_TYPE == "mail"* ]]; then
function_check backup_to_friends_servers function_check backup_to_friends_servers
backup_to_friends_servers backup_to_friends_servers
@ -673,7 +673,7 @@ function install_email {
if [[ $SYSTEM_TYPE == "mesh"* ]]; then if [[ $SYSTEM_TYPE == "mesh"* ]]; then
return return
fi fi
if grep -Fxq "install_email" $COMPLETION_FILE; then if [[ $(is_completed $FUNCNAME) == "1" ]]; then
return return
fi fi
apt-get -y remove postfix apt-get -y remove postfix

2
src/freedombone-utils-firewall
View File

@ -102,7 +102,7 @@ function configure_firewall {
} }
function configure_firewall_ping { function configure_firewall_ping {
if grep -Fxq "configure_firewall_ping" $COMPLETION_FILE; then if [[ $(is_completed $FUNCNAME) == "1" ]]; then
return return
fi fi
# Only allow ping for mesh installs # Only allow ping for mesh installs

2
src/freedombone-utils-setup
View File

@ -110,7 +110,7 @@ function initial_setup {
function search_for_attached_usb_drive { function search_for_attached_usb_drive {
# If a USB drive is attached then search for email, # If a USB drive is attached then search for email,
# gpg, ssh keys and emacs configuration # gpg, ssh keys and emacs configuration
if grep -Fxq "search_for_attached_usb_drive" $COMPLETION_FILE; then if [[ $(is_completed $FUNCNAME) == "1" ]]; then
return return
fi fi
if [ -b $USB_DRIVE ]; then if [ -b $USB_DRIVE ]; then