From ee8aebcda8d65e23f7c5537e374bb09163c6e535 Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Thu, 22 Feb 2018 20:50:09 +0100 Subject: Copy default configs independent of ADEI sources --- adei/scripts/adei-branch.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adei/scripts/adei-branch.sh b/adei/scripts/adei-branch.sh index f22cad3..b120f4a 100755 --- a/adei/scripts/adei-branch.sh +++ b/adei/scripts/adei-branch.sh @@ -23,6 +23,11 @@ fi flock -x 10 flock -x 11 + + if [ ! -f /adei/cfg/config.actual.php ]; then + cp -a /opt/configs/config.*.php /adei/cfg/ + fi + if [ ! -f /adei/src/VERSION ]; then bzr branch -r $ADEI_REVISION --use-existing-dir http://darksoft.org/bzr/adei/trunk/ /adei/src ( @@ -37,11 +42,6 @@ fi # but can be easily added in future. We cache all non-excluded setups. The .exclude # file is removed afterwards from all - if [ ! -f /adei/cfg/config.actual.php ]; then - - cp -a /opt/configs/config.*.php /adei/cfg/ - fi - ln -s ../cfg/config.actual.php config.actual.php ln -s ../cfg/config.override.php config.override.php ) -- cgit v1.2.3