You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jg...@apache.org on 2012/04/03 03:01:51 UTC
svn commit: r1308640 - in
/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin:
admin client
Author: jgoodyear
Date: Tue Apr 3 01:01:51 2012
New Revision: 1308640
URL: http://svn.apache.org/viewvc?rev=1308640&view=rev
Log:
[KARAF-1215] Shell scripts are incompatible with /bin/sh on Solaris
Updated admin and client scripts.
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin?rev=1308640&r1=1308639&r2=1308640&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin Tue Apr 3 01:01:51 2012
@@ -22,8 +22,9 @@ PROGNAME=`basename "$0"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-export KARAF_SCRIPT="admin"
-if [ -e "$DIRNAME/setenv" ]; then
+KARAF_SCRIPT="admin"
+export KARAF_SCRIPT
+if [ -f "$DIRNAME/setenv" ]; then
. "$DIRNAME/setenv"
fi
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client?rev=1308640&r1=1308639&r2=1308640&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client Tue Apr 3 01:01:51 2012
@@ -22,8 +22,9 @@ PROGNAME=`basename "$0"`
#
# Sourcing environment settings for karaf similar to tomcats setenv
#
-export KARAF_SCRIPT="client"
-if [ -e "$DIRNAME/setenv" ]; then
+KARAF_SCRIPT="client"
+export KARAF_SCRIPT
+if [ -f "$DIRNAME/setenv" ]; then
. "$DIRNAME/setenv"
fi