From 0b3a996edb89b442ada95b0b831b6c905156da57 Mon Sep 17 00:00:00 2001
From: "Oliver G. Mueller" <oliver@teqneers.de>
Date: Thu, 22 Feb 2018 16:00:32 +0100
Subject: [PATCH] changed default neo4j version to latest v3.3.3 create is now
 using instances folder as tmp to allow setfacl or other permissions to have
 an effect on new instances changed checks to be done before any download is
 triggered to save time and bandwidth changed tests accordingly

---
 ineo    | 36 ++++++++++++++++++------------------
 test.sh |  6 +-----
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/ineo b/ineo
index 3fdafa7..dc68c02 100755
--- a/ineo
+++ b/ineo
@@ -26,7 +26,7 @@ VERSION=1.1.0
 
 DEFAULT_HOME="${HOME}/.ineo"
 
-DEFAULT_VERSION='3.3.1'
+DEFAULT_VERSION='3.3.3'
 
 DEFAULT_PORT='7474'
 
@@ -464,6 +464,14 @@ function create {
     exit 1
   fi
 
+  # If directory for the instance exists then a message suggesting run or
+  # install with the option -f is showed
+  if [[ -d "${INEO_HOME}/instances/${instance_name}" ]] && ! ${force_install} ; then
+    printf "\n  ${PURPLE}Error -> A directory for the instance ${BOLD}${instance_name}${PURPLE} already exists\n"
+    printf "\n  ${NF}Maybe the instance already was created or try run the command ${UNDERLINE}install${NF} with the -f option to force the installation\n\n"
+    exit 1
+  fi
+
   # Bolt port only works with Neo4j version 3.0 or higher
   if [[ "${version%%.*}" -lt 3 && "${bolt_port}" ]]; then
     printf "\n  ${PURPLE}Error -> Bolt port only works on Neo4j 3.0 or higher\n"
@@ -483,43 +491,35 @@ function create {
   local tar_name="neo4j-${edition}-${version}-unix.tar.gz"
 
   # Donwload and create tar if doesn't exists
-  if ! [ -f ${INEO_HOME}/neo4j/${tar_name} ] || ${force_download}; then
-    curl -o ${TEMP_DIR}/${tar_name} ${NEO4J_HOSTNAME}/${tar_name}
+  if [[ ! -f "${INEO_HOME}/neo4j/${tar_name}" || ${force_download} ]]; then
+    curl -o "${TEMP_DIR}/${tar_name}" "${NEO4J_HOSTNAME}/${tar_name}"
 
-    mv ${TEMP_DIR}/${tar_name} ${INEO_HOME}/neo4j/${tar_name}
+    mv "${TEMP_DIR}/${tar_name}" "${INEO_HOME}/neo4j/${tar_name}"
   fi
 
   # Create tmp dir to extract
-  mkdir -p ${TEMP_DIR}/${version}
+  mkdir -p "${INEO_HOME}/instances/.${instance_name}"
   # if is not extracted then the tar maybe is not good, so a message suggesting
   # to use -d option is showed
-  if ! tar -xzf ${INEO_HOME}/neo4j/${tar_name} \
-    -C ${TEMP_DIR}/${version} &> /dev/null; then
+  if ! tar --strip 1 -xzf "${INEO_HOME}/neo4j/${tar_name}" \
+    -C "${INEO_HOME}/instances/.${instance_name}" &> /dev/null; then
     printf "\n  ${PURPLE}Error -> The tar file ${BOLD}${tar_name}${PURPLE} can't be extracted\n"
     printf "\n  ${NF}Try run the command ${UNDERLINE}create${NF} with the -d option to download the tar file again\n\n"
     exit 1
   fi
 
-  # If directory for the instance exists then a message suggesting run or
-  # install with the option -f is showed
-  if [[ -d "${INEO_HOME}/instances/${instance_name}" ]] && ! ${force_install} ; then
-    printf "\n  ${PURPLE}Error -> A directory for the instance ${BOLD}${instance_name}${PURPLE} already exists\n"
-    printf "\n  ${NF}Maybe the instance already was created or try run the command ${UNDERLINE}install${NF} with the -f option to force the installation\n\n"
-    exit 1
-  fi
-
   if ${force_install} ; then
     rm -rf "${INEO_HOME}/instances/${instance_name}"
   fi
 
   # Create a hidden file with the version used in this installation
-  echo "${version}" > "${TEMP_DIR}/${version}/neo4j-${edition}-${version}/.version"
+  echo "${version}" > "${INEO_HOME}/instances/.${instance_name}/.version"
 
   # Create a hidden file with the edition used in this installation
-  echo "${edition}" > "${TEMP_DIR}/${version}/neo4j-${edition}-${version}/.edition"
+  echo "${edition}" > "${INEO_HOME}/instances/.${instance_name}/.edition"
 
   # Finnaly move the instance for installation
-  mv ${TEMP_DIR}/${version}/neo4j-${edition}-${version} ${INEO_HOME}/instances/${instance_name}
+  mv "${INEO_HOME}/instances/.${instance_name}" "${INEO_HOME}/instances/${instance_name}"
 
   # If https or bolt port is not configured, then set them incrementally
   https_port=${https_port:-$((${port} + 1))}
diff --git a/test.sh b/test.sh
index a826aa9..7543833 100755
--- a/test.sh
+++ b/test.sh
@@ -165,7 +165,7 @@ function assert_run_pid {
   local pid=$1
   # we need to wait some seconds, because on fast computers the pid will exists 
   # even though neo4j terminates due to a configuration error
-  sleep 3 
+  sleep 3
   assert_raises "test $(ps -p $pid -o pid=)" 0
 }
 
@@ -877,10 +877,6 @@ CreateAnInstanceOnAExistingDirectoryAndTryAgainWithFOption() {
   ${NF}Maybe the instance already was created or try run the command ${UNDERLINE}install${NF} with the -f option to force the installation
 "
 
-  # Ensure the bad tar version of neo4j was downloaded
-  assert_raises \
-    "test -f $(pwd)/ineo_for_test/neo4j/neo4j-community-$LAST_VERSION-unix.tar.gz" 0
-
   # Ensure the instance directory is empty yet
   assert_raises "test $(ls -A ineo_for_test/instances/twitter)" 1