summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-02-22 20:50:09 +0100
committerSuren A. Chilingaryan <csa@suren.me>2018-02-22 20:50:09 +0100
commitee8aebcda8d65e23f7c5537e374bb09163c6e535 (patch)
tree8c9c5a72d62f09d1bc07906d40796b717c0d7bd7
parent733b1e4c50e5943de559778330061ed803070e1c (diff)
downloadadei-ee8aebcda8d65e23f7c5537e374bb09163c6e535.tar.gz
adei-ee8aebcda8d65e23f7c5537e374bb09163c6e535.tar.bz2
adei-ee8aebcda8d65e23f7c5537e374bb09163c6e535.tar.xz
adei-ee8aebcda8d65e23f7c5537e374bb09163c6e535.zip
Copy default configs independent of ADEI sources
-rwxr-xr-xadei/scripts/adei-branch.sh10
1 files 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
)