karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [2/5] karaf git commit: [KARAF-4852] Fix problem with the script debug options
Date Mon, 19 Dec 2016 22:57:39 GMT
[KARAF-4852] Fix problem with the script debug options

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/43f11c3f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/43f11c3f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/43f11c3f

Branch: refs/heads/master
Commit: 43f11c3f58fe2b732060f166af83411b8602eb46
Parents: ab07e3c
Author: Guillaume Nodet <gnodet@apache.org>
Authored: Mon Dec 19 16:54:22 2016 +0100
Committer: Guillaume Nodet <gnodet@apache.org>
Committed: Mon Dec 19 23:56:59 2016 +0100

----------------------------------------------------------------------
 .../base/src/main/filtered-resources/resources/bin/karaf        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/43f11c3f/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
index be08741..eb8b20b 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -206,7 +206,10 @@ run() {
         esac
     done
 
-    if [ ${debug} ] && [ ! ${nodebug} ]; then
+    if ${nodebug}; then
+        debug=false
+    fi
+    if ${debug}; then
         if [ "x${JAVA_DEBUG_OPTS}" = "x" ]; then
             JAVA_DEBUG_OPTS="${DEFAULT_JAVA_DEBUG_OPTS}"
         fi


Mime
View raw message