You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/02/22 21:20:46 UTC
svn commit: r1292491 - in
/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin:
karaf setenv start stop
Author: jbonofre
Date: Wed Feb 22 20:20:45 2012
New Revision: 1292491
URL: http://svn.apache.org/viewvc?rev=1292491&view=rev
Log:
[KARAF-1215] Use standard shell syntax instead of bash specific in Unix scripts
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv (contents, props changed)
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf?rev=1292491&r1=1292490&r2=1292491&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf Wed Feb 22 20:20:45 2012
@@ -22,8 +22,9 @@ PROGNAME=`basename "$0"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-export KARAF_SCRIPT="karaf"
-if [ -e "$DIRNAME/setenv" ]; then
+KARAF_SCRIPT="karaf"
+export KARAF_SCRIPT
+if [ -f "$DIRNAME/setenv" ]; then
. "$DIRNAME/setenv"
fi
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv?rev=1292491&r1=1292490&r2=1292491&view=diff
==============================================================================
(empty)
Propchange: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv
------------------------------------------------------------------------------
svn:executable = *
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start?rev=1292491&r1=1292490&r2=1292491&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start Wed Feb 22 20:20:45 2012
@@ -22,8 +22,9 @@ PROGNAME=`basename "$0"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-export KARAF_SCRIPT="start"
-if [ -e "$DIRNAME/setenv" ]; then
+KARAF_SCRIPT="start"
+export KARAF_SCRIPT
+if [ -f "$DIRNAME/setenv" ]; then
. "$DIRNAME/setenv"
fi
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop?rev=1292491&r1=1292490&r2=1292491&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop Wed Feb 22 20:20:45 2012
@@ -22,8 +22,9 @@ PROGNAME=`basename "$0"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-export KARAF_SCRIPT="stop"
-if [ -e "$DIRNAME/setenv" ]; then
+KARAF_SCRIPT="stop"
+export KARAF_SCRIPT
+if [ -f "$DIRNAME/setenv" ]; then
. "$DIRNAME/setenv"
fi