From 10d962ea8840f81218e2cc96778d65953463fb09 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 7 Jan 2021 11:14:44 +0100
Subject: [PATCH] docker/l3d#41 Fix ahoy setup
---
Dockerfile | 2 +-
start.sh | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 006e13f..686d5f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ ADD config.fish /etc/fish/
ADD start.sh /usr/local/bin/.start
ADD configIdea.sh /usr/local/bin/.configIdea
ADD l3dComposer.php /usr/local/bin/.l3dComposer.php
-ADD ahoy.changelog.yml /usr/local/bin/.ahoy.changelog.yml
+ADD ahoy.changelog.yml /etc/ahoy/changelog.yml
ADD run/scripts/info /usr/local/bin/l3d
ADD run/scripts/version /usr/local/bin/version
ADD run/scripts/l3dnewversion /usr/local/bin/l3dnewversion
diff --git a/start.sh b/start.sh
index a0d232b..7820c93 100755
--- a/start.sh
+++ b/start.sh
@@ -193,11 +193,20 @@ function setupAhoy {
echo "ahoyapi: v2" >.ahoy.yml
echo "commands:" >>.ahoy.yml
fi
+ if [[ ! -f .ahoy ]]; then
+ ln -s /etc/ahoy .ahoy
+ fi
+ if [[ -f .gitignore ]]; then
+ EXISTING=$(cat .gitignore | grep "^/.ahoy/$")
+ if [[ -z ${EXISTING} ]]; then
+ echo "/.ahoy/" >>.gitignore
+ fi
+ fi
EXISTING=$(cat .ahoy.yml | grep "^ changelog:")
if [[ -z ${EXISTING} ]]; then
echo " changelog:" >>.ahoy.yml
echo " imports:" >>.ahoy.yml
- echo " - /usr/local/bin/.ahoy.changelog.yml" >>.ahoy.yml
+ echo " - ./.ahoy/changelog.yml" >>.ahoy.yml
echo " usage: Changelog tools." >>.ahoy.yml
fi
}
--
GitLab