Skip to content

Commit 7fa05d9

Browse files
committed
fixup! Support windows tested in git bash
1 parent 3e0fcfb commit 7fa05d9

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

scripts/setupNeo4jInitialPassword.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,34 @@ fi
3030
# Print the environment variable NEO4J_HOME that is used to execute the command
3131
echo "setupNeo4jInitialPassword: Using ${NEO4J_INSTALLATION_DIRECTORY} as NEO4J_HOME"
3232

33+
# Extract the first component of the version number (=major version number)
34+
NEO4J_MAJOR_VERSION_NUMBER=$(echo "$NEO4J_VERSION" | cut -d'.' -f1)
35+
echo "setupNeo4jInitialPassword: Neo4j version ${NEO4J_MAJOR_VERSION_NUMBER} detected"
36+
3337
isWindows=false
3438
if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
3539
isWindows=true
3640
fi
3741
echo "setupNeo4jInitialPassword: Detected isWindows=${isWindows} for operating system type ${OSTYPE}"
3842

39-
# Extract the first component of the version number (=major version number)
40-
NEO4J_MAJOR_VERSION_NUMBER=$(echo "$NEO4J_VERSION" | cut -d'.' -f1)
41-
4243
# Check if the first component is greater than or equal to 5
4344
if [[ "$NEO4J_MAJOR_VERSION_NUMBER" -ge 5 ]]; then
44-
echo "setupNeo4jInitialPassword: Neo4j v5 or higher detected"
45+
echo "setupNeo4jInitialPassword: Neo4j v5 or higher used"
4546
# Neo4j version < 5
4647
# Set the initial password using a temporary NEO4J_HOME environment variable pointing to the current setup
4748
if [ "${isWindows}" = true ] ; then
48-
NEO4J_HOME="${NEO4J_INSTALLATION_DIRECTORY}" "${NEO4J_INSTALLATION_DIRECTORY}/bin/neo4j-admin.bat" dbms set-initial-password "${NEO4J_INITIAL_PASSWORD}"
49+
NEO4J_HOME="${NEO4J_INSTALLATION_DIRECTORY}" | "${NEO4J_INSTALLATION_DIRECTORY}/bin/neo4j-admin.bat" dbms set-initial-password "${NEO4J_INITIAL_PASSWORD}"
4950
else
50-
NEO4J_HOME="${NEO4J_INSTALLATION_DIRECTORY}" "${NEO4J_INSTALLATION_DIRECTORY}/bin/neo4j-admin" dbms set-initial-password "${NEO4J_INITIAL_PASSWORD}"
51+
NEO4J_HOME="${NEO4J_INSTALLATION_DIRECTORY}" | "${NEO4J_INSTALLATION_DIRECTORY}/bin/neo4j-admin" dbms set-initial-password "${NEO4J_INITIAL_PASSWORD}"
5152
fi
5253
else
53-
echo "setupNeo4jInitialPassword: Neo4j v4 or lower detected"
54+
echo "setupNeo4jInitialPassword: Neo4j v4 or lower used"
5455
# Neo4j version >= 5
5556
# Set the initial password using a temporary NEO4J_HOME environment variable pointing to the current setup
5657
if [ "${isWindows}" = true ] ; then
57-
NEO4J_HOME="${NEO4J_INSTALLATION_DIRECTORY}" "${NEO4J_INSTALLATION_DIRECTORY}/bin/neo4j-admin.bat" set-initial-password "${NEO4J_INITIAL_PASSWORD}"
58+
NEO4J_HOME="${NEO4J_INSTALLATION_DIRECTORY}" | "${NEO4J_INSTALLATION_DIRECTORY}/bin/neo4j-admin.bat" set-initial-password "${NEO4J_INITIAL_PASSWORD}"
5859
else
59-
NEO4J_HOME="${NEO4J_INSTALLATION_DIRECTORY}" "${NEO4J_INSTALLATION_DIRECTORY}/bin/neo4j-admin" set-initial-password "${NEO4J_INITIAL_PASSWORD}"
60+
NEO4J_HOME="${NEO4J_INSTALLATION_DIRECTORY}" | "${NEO4J_INSTALLATION_DIRECTORY}/bin/neo4j-admin" set-initial-password "${NEO4J_INITIAL_PASSWORD}"
6061
fi
6162
fi
6263

0 commit comments

Comments
 (0)