From 90501bd1451e4b75310449415f39831603b7edf2 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 7 May 2017 19:18:14 +0100 Subject: [PATCH] Remove the initial armadillo config if necessary --- src/freedombone-utils-gnusocialtools | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools index 8cdfdf81..394d02a4 100755 --- a/src/freedombone-utils-gnusocialtools +++ b/src/freedombone-utils-gnusocialtools @@ -849,6 +849,9 @@ function gnusocial_use_armadillo { sed -i "s|// addPlugin('Qvitter')|addPlugin('Qvitter')|g" /var/www/$domain_name/htdocs/config.php fi + if [ -f $INSTALL_DIR/armadillo/armadillo/config.json ]; then + rm $INSTALL_DIR/armadillo/armadillo/config.json + fi cp -r $INSTALL_DIR/armadillo/armadillo/* /var/www/${domain_name}/htdocs/armadillo cp $INSTALL_DIR/armadillo/armadillo.html /var/www/${domain_name}/htdocs/index.html cp $INSTALL_DIR/armadillo/dash.html /var/www/${domain_name}/htdocs/dash.html