Align usage of Cygwin in startserv and asadmin scripts

Signed-off-by:Ondro Mihalyi <mihalyi@omnifish.ee>
eclipse-ee4j · Dec 17, 2023 · d1205fa · d1205fa
1 parent 77c91ce
commit d1205fa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/appserver/distributions/glassfish-common/src/main/resources/bin/asadmin b/appserver/distributions/glassfish-common/src/main/resources/bin/asadmin
@@ -15,8 +15,10 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-# Always use JDK 1.6 or higher
 AS_INSTALL=`dirname "$0"`/../glassfish
+case "`uname`" in
+  CYGWIN*) AS_INSTALL=`cygpath --windows $AS_INSTALL`
+esac
 AS_INSTALL_LIB="$AS_INSTALL/lib"
 . "${AS_INSTALL}/config/asenv.conf"
 JAVA=java

diff --git a/appserver/distributions/glassfish-common/src/main/resources/bin/startserv b/appserver/distributions/glassfish-common/src/main/resources/bin/startserv
@@ -17,10 +17,10 @@
 #
 
 AS_INSTALL=`dirname "$0"`/../glassfish
-AS_INSTALL_LIB="$AS_INSTALL/modules"
 case "`uname`" in
   CYGWIN*) AS_INSTALL=`cygpath --windows $AS_INSTALL`
 esac
+AS_INSTALL_LIB="$AS_INSTALL/modules"
 . "${AS_INSTALL}/config/asenv.conf"
 JAVA=java
 #Depends upon Java from ../config/asenv.conf

diff --git a/appserver/distributions/glassfish-common/src/main/resources/glassfish/bin/asadmin b/appserver/distributions/glassfish-common/src/main/resources/glassfish/bin/asadmin
@@ -15,7 +15,6 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-# Always use JDK 1.6 or higher
 AS_INSTALL=`dirname "$0"`/..
 case "`uname`" in
   CYGWIN*) AS_INSTALL=`cygpath --windows $AS_INSTALL`

diff --git a/nucleus/distributions/nucleus-common/src/main/resources/bin/startserv b/nucleus/distributions/nucleus-common/src/main/resources/bin/startserv
@@ -17,10 +17,10 @@
 #
 
 AS_INSTALL=`dirname "$0"`/..
-AS_INSTALL_LIB="$AS_INSTALL/modules"
 case "`uname`" in
   CYGWIN*) AS_INSTALL=`cygpath --windows $AS_INSTALL`
 esac
+AS_INSTALL_LIB="$AS_INSTALL/modules"
 . "${AS_INSTALL}/config/asenv.conf"
 JAVA=java
 #Depends upon Java from ../config/asenv.conf