Skip to content

Commit

Permalink
added more information to action install
Browse files Browse the repository at this point in the history
fixed problem with curl URI
  • Loading branch information
ogmueller committed Sep 29, 2018
1 parent 9b93f07 commit 8fec510
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
12 changes: 10 additions & 2 deletions ineo
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,13 @@ function uninstall {
fi
fi

# Check if ineo service has been installed
if [[ $(whoami) == "root" ]]; then
if [[ $(ps -o comm 1 | tail -n 1 ) == "systemd" ]]; then
rm /lib/systemd/system/ineo.service
fi
fi

# Remove directory
rm -r "${INEO_HOME}"

Expand Down Expand Up @@ -1564,13 +1571,14 @@ HELP_INSTALL="
Install ineo
Don't use this command if you already have ineo installed and working
correctly.
correctly. If root user installs ineo on a systemd OS, a systemd
service will also be install to support autostart on instances.
OPTIONS:
-d <directory_name> Directory name (absolute path) where ineo will be
installed
Default: ~/.ineo
Default: ~/.ineo or /var/lib/ineo if root user
"

Expand Down
8 changes: 4 additions & 4 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ set -e
# Set the variables to create instances
# ------------------------------------------------------------------------------

export NEO4J_HOSTNAME="file:///$(pwd)/fake_neo4j_host"
export INEO_HOSTNAME="file:///$(pwd)/fake_ineo_host"
export NEO4J_HOSTNAME="file://$(pwd)/fake_neo4j_host"
export INEO_HOSTNAME="file://$(pwd)/fake_ineo_host"
export INEO_HOME="$(pwd)/ineo_for_test"

# ==============================================================================
Expand Down Expand Up @@ -821,7 +821,7 @@ CreateAnInstanceWithABadTarAndTryAgainWithDOption() {
$command_truncate -s20MB bad_tar_for_test/neo4j-community-${LAST_VERSION}-unix.tar.gz

# Change the NEO4J_HOSTNAME for test to download the bad tar
export NEO4J_HOSTNAME="file:///$(pwd)/bad_tar_for_test"
export NEO4J_HOSTNAME="file://$(pwd)/bad_tar_for_test"

# Make an installation
assert_raises "./ineo install -d $(pwd)/ineo_for_test" 0
Expand Down Expand Up @@ -861,7 +861,7 @@ CreateAnInstanceWithABadTarAndTryAgainWithDOption() {
assert_raises "test -f $(pwd)/ineo_for_test/instances/twitter/bin/neo4j" 0

# Restore the correct NEO4J_HOSTNAME for test
export NEO4J_HOSTNAME="file:///$(pwd)/fake_neo4j_host"
export NEO4J_HOSTNAME="file://$(pwd)/fake_neo4j_host"

assert_end CreateAnInstanceWithABadTarAndTryAgainWithDOption
}
Expand Down

0 comments on commit 8fec510

Please sign in to comment.