From 6baf1bd7bc3eb829993888635dec0b051715dc63 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Thu, 7 Sep 2017 12:53:51 +0200 Subject: [PATCH] Fix config file regression --- config => config.modele | 0 package_check.sh | 2 +- sub_scripts/lxc_build.sh | 3 ++- sub_scripts/lxc_check.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename config => config.modele (100%) diff --git a/config b/config.modele similarity index 100% rename from config rename to config.modele diff --git a/package_check.sh b/package_check.sh index 5afc28e..1f306ce 100755 --- a/package_check.sh +++ b/package_check.sh @@ -301,7 +301,7 @@ replace_default_value () { local value=$(grep "|| $CONFIG_KEY=" "$build_script" | cut -d '=' -f2) if grep -q $CONFIG_KEY= "$pcheck_config" then - sed -i "s/$CONFIG_KEY=.*/$CONFIG_KEY=$value/" + sed -i "s/$CONFIG_KEY=.*/$CONFIG_KEY=$value/" "$pcheck_config" else echo -e "$CONFIG_KEY=$value\n" >> "$pcheck_config" fi diff --git a/sub_scripts/lxc_build.sh b/sub_scripts/lxc_build.sh index def0def..c41c08b 100755 --- a/sub_scripts/lxc_build.sh +++ b/sub_scripts/lxc_build.sh @@ -19,7 +19,8 @@ then fi LOG_BUILD_LXC="$script_dir/Build_lxc.log" -test -n "$PLAGE_IP" || PLAGE_IP=10.1.4 # Utilise des valeurs par défaut si les variables sont vides. +# Utilise des valeurs par défaut si les variables sont vides. +test -n "$PLAGE_IP" || PLAGE_IP=10.1.4 test -n "$DOMAIN" || DOMAIN=domain.tld test -n "$YUNO_PWD" || YUNO_PWD=admin test -n "$LXC_NAME" || LXC_NAME=pchecker_lxc diff --git a/sub_scripts/lxc_check.sh b/sub_scripts/lxc_check.sh index 723f8e6..ba812f6 100755 --- a/sub_scripts/lxc_check.sh +++ b/sub_scripts/lxc_check.sh @@ -26,7 +26,7 @@ replace_default_value () { local value=$(grep "|| $CONFIG_KEY=" "$build_script" | cut -d '=' -f2) if grep -q $CONFIG_KEY= "$pcheck_config" then - sed -i "s/$CONFIG_KEY=.*/$CONFIG_KEY=$value/" + sed -i "s/$CONFIG_KEY=.*/$CONFIG_KEY=$value/" "$pcheck_config" else echo -e "$CONFIG_KEY=$value\n" >> "$pcheck_config" fi