Version 2.1.3-1.

1 files changed, 35 insertions, 21 deletions

diff --git a/bin.patch b/bin.patch
index d7bf976afe3a..21c05fc4f900 100644
--- a/bin.patch
+++ b/bin.patch
@@ -1,10 +1,23 @@
-diff -Naur neo4j-community-2.1.1-orig/bin/neo4j neo4j-community-2.1.1-mod/bin/neo4j
---- neo4j-community-2.1.1-orig/bin/neo4j	2014-05-29 13:24:28.000000000 -0300
-+++ neo4j-community-2.1.1-mod/bin/neo4j	2014-06-01 11:21:42.668017211 -0300
-@@ -46,10 +46,11 @@
-     cd "$(dirname "$SCRIPT")"
-     SCRIPT=`basename "$SCRIPT"`
-   done
+diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/bin/neo4j neo4j-community-2.1.3-mod/bin/neo4j
+--- neo4j-community-2.1.3-orig/bin/neo4j	2014-07-24 10:16:30.000000000 -0300
++++ neo4j-community-2.1.3-mod/bin/neo4j	2014-07-30 09:21:58.581917663 -0300
+@@ -33,23 +33,12 @@
+ LAUNCHD_NAME="org.neo4j.server"
+ 
+ function findBaseDirAndCdThere {
+-# This seems to not be safe to run at any time. If that
+-# is the case, it should be fixed to be so, if possible.
+-  SCRIPT=$0
+-
+-  cd "`dirname "$SCRIPT"`"
+-  SCRIPT=`basename "$SCRIPT"`
+-
+-  while [ -L "$SCRIPT" ]
+-  do
+-    SCRIPT=$( readlink "$SCRIPT" )
+-    cd "$(dirname "$SCRIPT")"
+-    SCRIPT=`basename "$SCRIPT"`
+-  done
 -  NEO4J_HOME=`cd $( dirname "$SCRIPT" )/.. && dirs -l +0`
 -  NEO4J_INSTANCE=$NEO4J_HOME
 -  NEO4J_CONFIG=$NEO4J_INSTANCE/conf
@@ -14,10 +27,11 @@ diff -Naur neo4j-community-2.1.1-orig/bin/neo4j neo4j-community-2.1.1-mod/bin/ne
 +  NEO4J_CONFIG=/etc/neo4j
 +  NEO4J_LOG=/var/log/neo4j
 +  NEO4J_SHARE=/usr/share/neo4j
++  NEO4J_RUNDIR=/run/neo4j
  
    cd "$NEO4J_HOME"
  }
-@@ -67,14 +68,14 @@
+@@ -67,14 +56,14 @@
  }
  
  findBaseDirAndCdThere
@@ -30,23 +44,23 @@ diff -Naur neo4j-community-2.1.1-orig/bin/neo4j neo4j-community-2.1.1-mod/bin/ne
  [ -z "${wrapper_java_maxmemory}" ] || JAVA_OPTS="$JAVA_OPTS -Xmx${wrapper_java_maxmemory}m"
  
 -#NEO4J_SERVER_PORT=`( egrep "^org.neo4j.server.webserver.port" $NEO4J_INSTANCE/conf/neo4j-server.properties || echo 7474 ) | sed -e 's/.*=//'`
-+#NEO4J_SERVER_PORT=`( egrep "^org.neo4j.server.webserver.port" ${NEO4J_CONFIG}/neo4j-server.properties || echo 7474 ) | sed -e 's/.*=//'`
++#NEO4J_SERVER_PORT=`( egrep "^org.neo4j.server.webserver.port" $NEO4J_CONFIG/neo4j-server.properties || echo 7474 ) | sed -e 's/.*=//'`
  NEO4J_SERVER_PORT=${org_neo4j_server_webserver_port:=7474}
  
  LAUNCHD_NAME="${LAUNCHD_NAME}.${NEO4J_SERVER_PORT}"
-@@ -90,16 +91,16 @@
+@@ -90,16 +79,16 @@
  # Username to propose for neo4j user, can be overridden by -u USERNAME option
  DEFAULT_USER='neo4j'
  
 -SCRIPT_NAME="${NEO4J_HOME}/bin/neo4j"
-+SCRIPT_NAME="/usr/bin/neo4j"
++SCRIPT_NAME="${NEO4J_SHARE}/bin/neo4j"
  SERVICE_NAME=${wrapper_ntservice_name:=neo4j-service}
  LAUNCHD_DIR=~/Library/LaunchAgents/
  
  TIMEOUT=120
  
 -PID_FILE=${NEO4J_INSTANCE}/data/neo4j-service.pid
-+PID_FILE=/run/neo4j/neo4j-service.pid
++PID_FILE=${NEO4J_RUNDIR}/neo4j-service.pid
  buildclasspath() {
    # confirm library jars
 -  LIBDIR="$NEO4J_HOME"/lib
@@ -54,7 +68,7 @@ diff -Naur neo4j-community-2.1.1-orig/bin/neo4j neo4j-community-2.1.1-mod/bin/ne
    if [ ! -e "$LIBDIR" ] ; then
      echo "Error: missing Neo4j Library, expected at $LIBDIR"
      exit 1
-@@ -134,7 +135,7 @@
+@@ -134,7 +123,7 @@
    CLASSPATH=${ALL_JARS}
  
    # add useful conf stuff to classpath - always a good idea
@@ -63,7 +77,7 @@ diff -Naur neo4j-community-2.1.1-orig/bin/neo4j neo4j-community-2.1.1-mod/bin/ne
  }
  
  detectrunning() {
-@@ -289,16 +290,16 @@
+@@ -289,16 +278,16 @@
  # pass in "true" for created to mark that the user was created (instead than pre-existing)
  modify_user_config() {
    created=${2:-"false"}
@@ -86,21 +100,21 @@ diff -Naur neo4j-community-2.1.1-orig/bin/neo4j neo4j-community-2.1.1-mod/bin/ne
    fi
  }
  
-diff -Naur neo4j-community-2.1.1-orig/bin/neo4j-shell neo4j-community-2.1.1-mod/bin/neo4j-shell
---- neo4j-community-2.1.1-orig/bin/neo4j-shell	2014-05-29 13:24:28.000000000 -0300
-+++ neo4j-community-2.1.1-mod/bin/neo4j-shell	2014-06-01 11:23:17.293095310 -0300
+diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/bin/neo4j-shell neo4j-community-2.1.3-mod/bin/neo4j-shell
+--- neo4j-community-2.1.3-orig/bin/neo4j-shell	2014-07-24 10:16:30.000000000 -0300
++++ neo4j-community-2.1.3-mod/bin/neo4j-shell	2014-07-30 09:39:15.685405615 -0300
 @@ -86,7 +86,7 @@
  
  if [ -z "$REPO" ]
  then
 -  REPO="$BASEDIR"/lib
-+  REPO=/usr/share/java/neo4j/
++  REPO=/usr/share/java/neo4j
  fi
  
  LIBRARY_JARS=""
-diff -Naur neo4j-community-2.1.1-orig/bin/utils neo4j-community-2.1.1-mod/bin/utils
---- neo4j-community-2.1.1-orig/bin/utils	2014-05-29 13:24:28.000000000 -0300
-+++ neo4j-community-2.1.1-mod/bin/utils	2014-06-01 11:24:51.224800589 -0300
+diff -U 3 -H -d -r -N -- neo4j-community-2.1.3-orig/bin/utils neo4j-community-2.1.3-mod/bin/utils
+--- neo4j-community-2.1.3-orig/bin/utils	2014-07-24 10:16:30.000000000 -0300
++++ neo4j-community-2.1.3-mod/bin/utils	2014-07-30 09:42:28.360468307 -0300
 @@ -324,11 +324,11 @@
  # in place.
  checkandrepairenv() {