From 48cb40c2d3b0d339b773104ed9a552d56991cde8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Mon, 17 Oct 2016 13:59:45 +0100
Subject: [PATCH] Removing config file entries
---
src/freedombone-app-htmly | 9 ++++-----
src/freedombone-utils-config | 31 +++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly
index 73a61ef60..6413acf15 100755
--- a/src/freedombone-app-htmly
+++ b/src/freedombone-app-htmly
@@ -324,14 +324,13 @@ function remove_htmly {
if [ -d /var/www/$HTMLY_DOMAIN_NAME ]; then
rm -rf /var/www/$HTMLY_DOMAIN_NAME
fi
- if [ $HTMLY_CODE ]; then
- sed -i '/HTMLY_DOMAIN_NAME.*/d' $CONFIGURATION_FILE
- sed -i '/HTMLY_CODE.*/d' $CONFIGURATION_FILE
- fi
+ remove_config_param HTMLY_DOMAIN_NAME
+ remove_config_param HTMLY_CODE
function_check remove_onion_service
remove_onion_service htmly ${HTMLY_ONION_PORT}
- sed -i '/install_htmly/d' $COMPLETION_FILE
+ remove_completion_param install_htmly
sed -i '/Htmly .*/d' $COMPLETION_FILE
+ sed -i '/htmly .*/d' $COMPLETION_FILE
}
function get_htmly_admin_password {
diff --git a/src/freedombone-utils-config b/src/freedombone-utils-config
index e8ef5d28f..f6ba4142a 100755
--- a/src/freedombone-utils-config
+++ b/src/freedombone-utils-config
@@ -229,6 +229,37 @@ function write_config_param {
fi
}
+function remove_config_param {
+ param_name="$1"
+
+ if [ ${#param_name} -gt 0 ]; then
+ if [ $CONFIGURATION_FILE ]; then
+ if [ -f $CONFIGURATION_FILE ]; then
+ if grep -q "${param_name}=" $CONFIGURATION_FILE; then
+ sed -i "/${param_name}=/d" $CONFIGURATION_FILE
+ fi
+ fi
+ fi
+ fi
+}
+
+function remove_completion_param {
+ param_name="$1"
+
+ if [ ${#param_name} -gt 0 ]; then
+ if [ $COMPLETION_FILE ]; then
+ if [ -f $COMPLETION_FILE ]; then
+ if grep -Fxq "${param_name}" $COMPLETION_FILE; then
+ sed -i "/${param_name}/d" $COMPLETION_FILE
+ fi
+ if grep -q "${param_name}:" $COMPLETION_FILE; then
+ sed -i "/${param_name}:/d" $COMPLETION_FILE
+ fi
+ fi
+ fi
+ fi
+}
+
function save_configuration_values {
for v in "${configuration_variables[@]}"
do
--
GitLab