You are viewing a plain text version of this content. The canonical link for it is here.

Posted to derby-commits@db.apache.org by rh...@apache.org on 2022/09/19 14:28:19 UTC

svn commit: r1904148 - /db/derby/code/trunk/bin/templates/derby_common.sh

Author: rhillegas
Date: Mon Sep 19 14:28:18 2022
New Revision: 1904148

URL: http://svn.apache.org/viewvc?rev=1904148&view=rev
Log:
DERBY-6925: Add defensive code to startup scripts; commit patch DERBY-6925.diff contributed by Piotr Zigielo.

Modified:
    db/derby/code/trunk/bin/templates/derby_common.sh

Modified: db/derby/code/trunk/bin/templates/derby_common.sh
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/bin/templates/derby_common.sh?rev=1904148&r1=1904147&r2=1904148&view=diff
==============================================================================
--- db/derby/code/trunk/bin/templates/derby_common.sh (original)
+++ db/derby/code/trunk/bin/templates/derby_common.sh Mon Sep 19 14:28:18 2022
@@ -162,8 +162,10 @@ if $cygwin; then
 fi
 
 # Readjust classpath for MKS
+if [ -n "$SHELL" ] ; then
 # expr match 
 if [ \( "`expr $SHELL : '.*sh.exe$'`" -gt 0 \) -a \( "$cygwin" = "false" \) ]; then
   LOCALCLASSPATH=`echo $LOCALCLASSPATH | sed -E 's/([\d\w]*):([\d\w]*)/\1;\2/g
 '`
 fi
+fi