karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggrzy...@apache.org
Subject [karaf] branch karaf-4.2.x updated: [KARAF-6449] Fix file not found bug when running outside of contrib folder
Date Thu, 10 Oct 2019 05:39:48 GMT
This is an automated email from the ASF dual-hosted git repository.

ggrzybek pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new 3f19dec  [KARAF-6449] Fix file not found bug when running outside of contrib folder
3f19dec is described below

commit 3f19dec95329440c6033be08d42d4d9f1deb2902
Author: Vratislav Hais <vhais@redhat.com>
AuthorDate: Wed Oct 9 15:16:51 2019 +0200

    [KARAF-6449] Fix file not found bug when running outside of contrib folder
    
    (cherry picked from commit 11bbc46fb57e2dcb8ff03432a5308aa6290d26a9)
---
 .../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"
+
 
 ################################################################################
 #


Mime
View raw message