You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gg...@apache.org on 2019/10/10 05:35:21 UTC
[karaf] branch master updated: [KARAF-6449] Fix file not found bug
when running outside of contrib folder
This is an automated email from the ASF dual-hosted git repository.
ggrzybek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 11bbc46 [KARAF-6449] Fix file not found bug when running outside of contrib folder
new 365dd64 Merge pull request #953 from VratislavHais/KARAF-6449
11bbc46 is described below
commit 11bbc46fb57e2dcb8ff03432a5308aa6290d26a9
Author: Vratislav Hais <vh...@redhat.com>
AuthorDate: Wed Oct 9 15:16:51 2019 +0200
[KARAF-6449] Fix file not found bug when running outside of contrib folder
---
.../resources/resources/bin/contrib/karaf-service.sh | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service.sh b/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service.sh
index 0c47886..a095aea 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service.sh
+++ b/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service.sh
@@ -36,13 +36,15 @@ END
exit
}
-CONF_TEMPLATE="karaf-service-template.conf"
-SYSTEMD_TEMPLATE="karaf-service-template.systemd"
-SYSTEMD_TEMPLATE_INSTANCES="karaf-service-template.systemd-instances"
-INIT_TEMPLATE="karaf-service-template.init"
-INIT_REDHAT_TEMPLATE="karaf-service-template.init-redhat"
-INIT_DEBIAN_TEMPLATE="karaf-service-template.init-debian"
-SOLARIS_SMF_TEMPLATE="karaf-service-template.solaris-smf"
+CONTRIB_FOLDER=`dirname "$0"`
+CONF_TEMPLATE="${CONTRIB_FOLDER}/karaf-service-template.conf"
+SYSTEMD_TEMPLATE="${CONTRIB_FOLDER}/karaf-service-template.systemd"
+SYSTEMD_TEMPLATE_INSTANCES="${CONTRIB_FOLDER}/karaf-service-template.systemd-instances"
+INIT_TEMPLATE="${CONTRIB_FOLDER}/karaf-service-template.init"
+INIT_REDHAT_TEMPLATE="${CONTRIB_FOLDER}/karaf-service-template.init-redhat"
+INIT_DEBIAN_TEMPLATE="${CONTRIB_FOLDER}/karaf-service-template.init-debian"
+SOLARIS_SMF_TEMPLATE="${CONTRIB_FOLDER}/karaf-service-template.solaris-smf"
+
################################################################################
#