jar is no longer called cypher-shell-all.jar

Author: pontusmelke

Makefile

@@ -26,7 +26,7 @@ rpmversion := $(versionnumber)-$(release)
 
 GRADLE = ./gradlew -PbuildVersion=$(buildversion)
 
-jarfile := cypher-shell-all.jar
+jarfile := cypher-shell.jar
 rpmfile := cypher-shell-$(rpmversion).noarch.rpm
 debfile := cypher-shell_$(debversion)_all.deb
 

cypher-shell/src/dist/cypher-shell

@@ -69,12 +69,12 @@ _show_java_help() {
 build_classpath() {
   APP_HOME="$(cd "$(dirname "$0")" && pwd)"
   # First try in sub directory
-  JARPATH="$(find "${APP_HOME}" -name "cypher-shell-all.jar" )"
+  JARPATH="$(find "${APP_HOME}" -name "cypher-shell.jar" )"
 
   # Then try installation directory (prefix/bin and prefix/share/cypher-shell/lib)
   if [[ -z "${JARPATH}" ]]; then
     APP_HOME="${APP_HOME}/../share/cypher-shell"
-    JARPATH="$(find "${APP_HOME}" -name "cypher-shell-all.jar" )"
+    JARPATH="$(find "${APP_HOME}" -name "cypher-shell.jar" )"
   fi
 }
 

cypher-shell/src/dist/cypher-shell.bat

@@ -71,7 +71,7 @@ set CMD_LINE_ARGS=%$
 
 SETLOCAL EnableDelayedExpansion
 SET CYPHER_SHELL_JAR=
-FOR /f "delims=" %%a in ('dir "%NEO4J_HOME%\cypher-shell-all.jar" /s/b') do set CYPHER_SHELL_JAR=!CYPHER_SHELL_JAR!%%a
+FOR /f "delims=" %%a in ('dir "%NEO4J_HOME%\cypher-shell.jar" /s/b') do set CYPHER_SHELL_JAR=!CYPHER_SHELL_JAR!%%a
 
 @rem Execute cypher-shell
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %CYPHER_SHELL_OPTS%  -jar "%CYPHER_SHELL_JAR%" %CMD_LINE_ARGS%

packaging/debian/cypher-shell.install

@@ -1,2 +1,2 @@
 cypher-shell/build/install/cypher-shell/cypher-shell            usr/bin
-cypher-shell/build/install/cypher-shell/cypher-shell-all.jar    usr/share/cypher-shell/lib
+cypher-shell/build/install/cypher-shell/cypher-shell.jar    usr/share/cypher-shell/lib