From ca09c10cc8ca1cb722457158102e8f1d983809fc Mon Sep 17 00:00:00 2001 From: Will Holland Date: Mon, 28 Sep 2015 07:15:40 +0100 Subject: Fix copying ybd.conf --- triggers/builders_trigger.sh | 4 ++-- triggers/deploy_trigger.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/triggers/builders_trigger.sh b/triggers/builders_trigger.sh index 126ef9e..c8690f7 100644 --- a/triggers/builders_trigger.sh +++ b/triggers/builders_trigger.sh @@ -14,6 +14,6 @@ git clone -n https://github.com/devcurmudgeon/ybd.git git --git-dir=./ybd/.git --work-tree=./ybd checkout 15.39 cp ../builder_logic.py . cp ../build_a_system.sh . -cp ybd.conf ybd -cp ybd.conf ybd/config +cp ../ybd.conf ybd +cp ../ybd.conf ybd/config ./bin/python builder_logic.py "$REF" "$SHA" "$SYSTEM" diff --git a/triggers/deploy_trigger.sh b/triggers/deploy_trigger.sh index dab3364..e4975a7 100644 --- a/triggers/deploy_trigger.sh +++ b/triggers/deploy_trigger.sh @@ -21,8 +21,8 @@ git clone -n https://github.com/devcurmudgeon/ybd.git git --git-dir=./ybd/.git --work-tree=./ybd checkout 15.39 cp ../deploy_logic.py . cp ../deploy_a_system.sh . -cp ybd.conf ybd -cp ybd.conf ybd/config +cp ../ybd.conf ybd +cp ../ybd.conf ybd/config if [ -d ybd ]; then rm -rf ybd fi -- cgit v1.2.1