fixup! Support windows tested in git bash

Author: JohT

scripts/setupNeo4j.sh

@@ -4,7 +4,7 @@
 
 # Note: The environment variable NEO4J_INITIAL_PASSWORD needs to be set.
 
-# Requires download.sh,setupNeo4jInitialPassword.sh
+# Requires download.sh,setupNeo4jInitialPassword.sh,operatingSystemFunctions.sh
 
 # Fail on any error ("-e" = exit on first error, "-o pipefail" exist on errors within piped commands)
 set -eo pipefail
@@ -68,22 +68,16 @@ if [ -z "${NEO4J_INITIAL_PASSWORD}" ]; then
     exit 1
 fi
 
+# Include operation system function to for example detect Windows.
+source "${SCRIPTS_DIR}/operatingSystemFunctions.sh"
+
 # Download and extract Neo4j
 if [ ! -d "${NEO4J_INSTALLATION_DIRECTORY}" ] ; then
 
-    isWindows=false
-    if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
-        isWindows=true
-    fi
-    echo "setupNeo4j: Detected isWindows=${isWindows} for operating system type ${OSTYPE}"
-    
-    neo4jInstallationSystemPostfix="unix.tar.gz"
-    if [[ "${isWindows}" = true ]]; then
-        neo4jInstallationSystemPostfix="windows.zip"
-    fi
-    echo "setupNeo4j: Using ${neo4jInstallationSystemPostfix} for operating system type ${OSTYPE}"
-
+    neo4jInstallationSystemPostfix=$(ifWindows "windows.zip" "unix.tar.gz")
     neo4jDownloadArchiveFileName="${NEO4J_INSTALLATION_NAME}-${neo4jInstallationSystemPostfix}"
+    echo "setupNeo4j: Using Neo4j distribution ${neo4jDownloadArchiveFileName}"
+
     source "${SCRIPTS_DIR}/download.sh" --url "https://dist.neo4j.org/${neo4jDownloadArchiveFileName}" || exit 1
 
     if [[ ${neo4jInstallationSystemPostfix} == "unix.tar.gz" ]]; then
@@ -105,7 +99,7 @@ if [ ! -d "${NEO4J_INSTALLATION_DIRECTORY}" ] ; then
     echo "setupNeo4j: Configuring dynamic settings (data directories, ports, ...)"
 
     ## TODO find a solution for Windows e.g. converting the paths to Windows style
-    if [[ "${isWindows}" = false ]]; then
+    if ! isWindows; then
         if [[ "$NEO4J_MAJOR_VERSION_NUMBER" -ge 5 ]]; then
             echo "setupNeo4j: Neo4j v5 or higher detected"
             {

scripts/startNeo4j.sh

@@ -5,7 +5,7 @@
 # Note: Does nothing if the database is already running.
 # Note: It requires Neo4j to be installed in the TOOLS_DIRECTORY.
 
-# Requires waitForNeo4jHttp.sh
+# Requires waitForNeo4jHttp.sh,operatingSystemFunctions.sh
 
 # Fail on any error ("-e" = exit on first error, "-o pipefail" exist on errors within piped commands)
 set -eo pipefail
@@ -43,28 +43,22 @@ else
     exit 1
 fi
 
-isWindows=false
-if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
-    isWindows=true
-fi
-echo "startNeo4j: Detected isWindows=${isWindows} for operating system type ${OSTYPE}"
+# Include operation system function to for example detect Windows.
+source "${SCRIPTS_DIR}/operatingSystemFunctions.sh"
 
-scriptExtension=""
-if [[ "${isWindows}" = true ]]; then
-    scriptExtension=".bat"
-    echo "startNeo4j: Using scriptExtension ${scriptExtension} for Windows."
-fi
+scriptExtension=$(ifWindows ".bat" "")
+echo "startNeo4j: Using scriptExtension ${scriptExtension} for Windows."
 
 # Include functions to check or wait for the database to be ready
 source "${SCRIPTS_DIR}/waitForNeo4jHttpFunctions.sh"
 
 # Check if Neo4j is stopped (not running) using a temporary NEO4J_HOME environment variable that points to the current installation
 isDatabaseReady=$(isDatabaseQueryable)
 if [[ ${isDatabaseReady} == "false" ]]; then
-    echo "startNeo4j: Starting neo4j-${NEO4J_EDITION}-${NEO4J_VERSION} in ${NEO4J_DIR} with isWindows=${isWindows}"
+    echo "startNeo4j: Starting neo4j-${NEO4J_EDITION}-${NEO4J_VERSION} in ${NEO4J_DIR}"
 
     # Check if there is already a process that listens to the Neo4j HTTP port
-    if [[ "${isWindows}" = true ]]; then
+    if isWindows; then
         echo "startNeo4j: Skipping detection of processes listening to port ${NEO4J_HTTP_PORT} on Windows"
     else
         port_listener_process_id=$( lsof -t -i:"${NEO4J_HTTP_PORT}" -sTCP:LISTEN || true )
@@ -77,7 +71,7 @@ if [[ ${isDatabaseReady} == "false" ]]; then
     fi
 
     # Start Neo4j using a temporary NEO4J_HOME environment variable that points to the current installation
-    if [[ "${isWindows}" = true ]]; then
+    if isWindows; then
         neo4jStartCommand="${NEO4J_BIN_WINDOWS}\neo4j${scriptExtension} console --verbose"
         # On Windows it is necessary to take the absolute full qualified path to Neo4j for the environment variable NEO4J_HOME.
         # It also works without any environment variable but this would likely lead to ambiguity problems when there are multiple Neo4j instances installed.

scripts/stopNeo4j.sh

@@ -4,6 +4,8 @@
 
 # Note: Does nothing if the database is already stopped.
 
+# Requires waitForNeo4jHttp.sh,operatingSystemFunctions.sh
+
 # Fail on any error ("-e" = exit on first error, "-o pipefail" exist on errors within piped commands)
 set -eo pipefail
 
@@ -37,11 +39,8 @@ else
     exit 1
 fi
 
-isWindows=false
-if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
-    isWindows=true
-fi
-echo "stopNeo4j: Detected isWindows=${isWindows} for operating system type ${OSTYPE}"
+# Include operation system function to for example detect Windows.
+source "${SCRIPTS_DIR}/operatingSystemFunctions.sh"
 
 # Include functions to check or wait for the database to be ready
 source "${SCRIPTS_DIR}/waitForNeo4jHttpFunctions.sh"
@@ -52,7 +51,7 @@ if [[ ${isDatabaseReady} == "false" ]]; then
     echo "stopNeo4j: neo4j-${NEO4J_EDITION}-${NEO4J_VERSION} already stopped"
     exit 0
 else
-    if [[ "${isWindows}" = true ]]; then
+    if isWindows; then
         echo "stopNeo4j: IMPORTANT: Please close the console window manually where neo4j-${NEO4J_EDITION}-${NEO4J_VERSION} is running on Windows."
     else
         # Stop Neo4j using a temporary NEO4J_HOME environment variable that points to the current installation
@@ -65,14 +64,14 @@ isDatabaseReady=$(isDatabaseQueryable)
 if [[ ${isDatabaseReady} == "false" ]]; then
     echo "stopNeo4j: Successfully stopped neo4j-${NEO4J_EDITION}-${NEO4J_VERSION}"
 else
-    if [[ "${isWindows}" = false ]]; then
+    if ! isWindows; then
         echo "stopNeo4j: neo4j-${NEO4J_EDITION}-${NEO4J_VERSION} still running. Something went wrong. Details see 'NEO4J_HOME=${NEO4J_DIR} ${NEO4J_BIN}/neo4j${scriptExtension} status'."
         exit 1
     fi
 fi
 
 # Check if there are still processes running that listen to the Neo4j HTTP port
-if [[ "${isWindows}" = true ]]; then
+if isWindows; then
     echo "stopNeo4j: Skipping detection of processes listening to port ${NEO4J_HTTP_PORT} on Windows"
 else
     port_listener_process_id=$( lsof -t -i:"${NEO4J_HTTP_PORT}" -sTCP:LISTEN || true )