summarylogtreecommitdiffstats
path: root/startup-scripts-fix-paths.patch
blob: e41c5647a9b7612ea96354705b47a95c5f09a2fd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
--- neo4j-enterprise-5.18.1/bin/neo4j	2024-03-14 16:49:22.000000000 +0100
+++ pbin/neo4j	2024-04-04 12:57:10.506095591 +0200
@@ -2,7 +2,7 @@
 # Copyright (c) "Neo4j"
 # Neo4j Sweden AB [https://neo4j.com]
 # This file is a commercial add-on to Neo4j Enterprise Edition.
-
+export NEO4J_CONF=/etc/neo4j
 
 # resolve links - $0 may be a softlink
 PRG="$0"
@@ -102,6 +102,10 @@
   [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
 fi
 
+BASEDIR="/usr/share/java/neo4j"
+CLASSPATH="$BASEDIR:$BASEDIR/*"
+REPO="$BASEDIR/repo"
+
 exec "$JAVACMD" -Xmx128m \
   -classpath "$CLASSPATH" \
   -Dapp.name="neo4j" \
@@ -110,4 +114,4 @@
   -Dapp.home="$BASEDIR" \
   -Dbasedir="$BASEDIR" \
   org.neo4j.server.startup.Neo4jBoot \
-  "$@"
\ No newline at end of file
+  "$@"
--- neo4j-enterprise-5.18.1/bin/neo4j-admin	2024-03-14 16:49:22.000000000 +0100
+++ pbin/neo4j-admin	2024-04-04 13:50:44.316292561 +0200
@@ -2,7 +2,7 @@
 # Copyright (c) "Neo4j"
 # Neo4j Sweden AB [https://neo4j.com]
 # This file is a commercial add-on to Neo4j Enterprise Edition.
-
+export NEO4J_CONF=/etc/neo4j
 
 # resolve links - $0 may be a softlink
 PRG="$0"
@@ -41,7 +41,7 @@
 			  else
 			      JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
 			  fi
-           fi       
+           fi
            ;;
 esac
 
@@ -71,6 +71,9 @@
   fi
 fi
 
+# this is where Java 17 is installed by the official Arch package
+JAVACMD="/usr/lib/jvm/java-17-openjdk/bin/java"
+
 if [ ! -x "$JAVACMD" ] ; then
   echo "Error: JAVA_HOME is not defined correctly." 1>&2
   echo "  We cannot execute $JAVACMD" 1>&2
@@ -102,6 +105,10 @@
   [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
 fi
 
+BASEDIR="/usr/share/java/neo4j"
+CLASSPATH="$BASEDIR:$BASEDIR/*:$CLASSPATH"
+REPO="$BASEDIR/repo"
+
 exec "$JAVACMD" -Xmx128m \
   -classpath "$CLASSPATH" \
   -Dapp.name="neo4j-admin" \
@@ -110,4 +117,4 @@
   -Dapp.home="$BASEDIR" \
   -Dbasedir="$BASEDIR" \
   org.neo4j.server.startup.Neo4jAdminBoot \
-  "$@"
\ No newline at end of file
+  "$@"
--- neo4j-enterprise-5.18.1/bin/cypher-shell	2024-03-14 16:34:28.000000000 +0100
+++ pbin/cypher-shell	2024-04-04 13:10:04.789476453 +0200
@@ -18,7 +18,6 @@
 #   Copyright (c) 2001-2006 The Apache Software Foundation.  All rights
 #   reserved.
 
-
 # resolve links - $0 may be a softlink
 PRG="$0"
 
@@ -38,6 +37,10 @@
 # Reset the REPO variable. If you need to influence this use the environment setup file.
 REPO=
 
+# Paths for Arch Linux AUR installation:
+BASEDIR="/usr/share/java/neo4j"
+CLASSPATH="$BASEDIR:$BASEDIR/*"
+REPO="$BASEDIR"
 
 # OS specific support.  $var _must_ be set to either true or false.
 cygwin=false;
@@ -56,7 +59,7 @@
 			  else
 			      JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
 			  fi
-           fi       
+           fi
            ;;
 esac
 
@@ -97,7 +100,10 @@
   REPO="$BASEDIR"/lib
 fi
 
-CLASSPATH="$BASEDIR"/etc:"$REPO"/neo4j-java-driver-5.17.0.jar:"$REPO"/reactive-streams-1.0.4.jar:"$REPO"/netty-handler-4.1.106.Final.jar:"$REPO"/netty-common-4.1.106.Final.jar:"$REPO"/netty-resolver-4.1.106.Final.jar:"$REPO"/netty-buffer-4.1.106.Final.jar:"$REPO"/netty-transport-4.1.106.Final.jar:"$REPO"/netty-transport-native-unix-common-4.1.106.Final.jar:"$REPO"/netty-codec-4.1.106.Final.jar:"$REPO"/netty-tcnative-classes-2.0.61.Final.jar:"$REPO"/reactor-core-3.6.2.jar:"$REPO"/cypher-literal-interpreter-5.18.1.jar:"$REPO"/neo4j-values-5.18.1.jar:"$REPO"/neo4j-graphdb-api-5.18.1.jar:"$REPO"/annotations-5.18.1.jar:"$REPO"/eclipse-collections-11.1.0.jar:"$REPO"/eclipse-collections-api-11.1.0.jar:"$REPO"/commons-lang3-3.14.0.jar:"$REPO"/neo4j-common-5.18.1.jar:"$REPO"/commons-text-1.11.0.jar:"$REPO"/neo4j-resource-5.18.1.jar:"$REPO"/neo4j-collections-5.18.1.jar:"$REPO"/caffeine-3.1.8.jar:"$REPO"/neo4j-exceptions-5.18.1.jar:"$REPO"/neo4j-unsafe-5.18.1.jar:"$REPO"/jna-5.14.0.jar:"$REPO"/cypher-ast-factory-5.18.1.jar:"$REPO"/neo4j-cypher-javacc-parser-5.18.1.jar:"$REPO"/neo4j-cypher-dsl-2023.9.3.jar:"$REPO"/argparse4j-0.9.0.jar:"$REPO"/jline-terminal-3.21.0.jar:"$REPO"/jline-reader-3.21.0.jar:"$REPO"/jline-terminal-jansi-3.21.0.jar:"$REPO"/jansi-2.4.0.jar:"$REPO"/cypher-shell-5.18.1.jar
+BASEDIR="/usr/share/java/neo4j"
+REPO="$BASEDIR"
+
+CLASSPATH="$BASEDIR":"$REPO"/neo4j-java-driver-5.17.0.jar:"$REPO"/reactive-streams-1.0.4.jar:"$REPO"/netty-handler-4.1.106.Final.jar:"$REPO"/netty-common-4.1.106.Final.jar:"$REPO"/netty-resolver-4.1.106.Final.jar:"$REPO"/netty-buffer-4.1.106.Final.jar:"$REPO"/netty-transport-4.1.106.Final.jar:"$REPO"/netty-transport-native-unix-common-4.1.106.Final.jar:"$REPO"/netty-codec-4.1.106.Final.jar:"$REPO"/netty-tcnative-classes-2.0.61.Final.jar:"$REPO"/reactor-core-3.6.2.jar:"$REPO"/cypher-literal-interpreter-5.18.1.jar:"$REPO"/neo4j-values-5.18.1.jar:"$REPO"/neo4j-graphdb-api-5.18.1.jar:"$REPO"/annotations-5.18.1.jar:"$REPO"/eclipse-collections-11.1.0.jar:"$REPO"/eclipse-collections-api-11.1.0.jar:"$REPO"/commons-lang3-3.14.0.jar:"$REPO"/neo4j-common-5.18.1.jar:"$REPO"/commons-text-1.11.0.jar:"$REPO"/neo4j-resource-5.18.1.jar:"$REPO"/neo4j-collections-5.18.1.jar:"$REPO"/caffeine-3.1.8.jar:"$REPO"/neo4j-exceptions-5.18.1.jar:"$REPO"/neo4j-unsafe-5.18.1.jar:"$REPO"/jna-5.14.0.jar:"$REPO"/cypher-ast-factory-5.18.1.jar:"$REPO"/neo4j-cypher-javacc-parser-5.18.1.jar:"$REPO"/neo4j-cypher-dsl-2023.9.3.jar:"$REPO"/argparse4j-0.9.0.jar:"$REPO"/jline-terminal-3.21.0.jar:"$REPO"/jline-reader-3.21.0.jar:"$REPO"/jline-terminal-jansi-3.21.0.jar:"$REPO"/jansi-2.4.0.jar:"$REPO"/cypher-shell-5.18.1.jar
 
 ENDORSED_DIR=
 if [ -n "$ENDORSED_DIR" ] ; then
@@ -124,5 +130,5 @@
   -Dapp.repo="$REPO" \
   -Dapp.home="$BASEDIR" \
   -Dbasedir="$BASEDIR" \
-  org.neo4j.shell.startup.CypherShellBoot \
+  org.neo4j.shell.Main \
   "$@"