From 526458756a6a412db01f0f9e620da551a4a05025 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 17 Jan 2019 21:26:32 +0100 Subject: [PATCH] special stunt for arangoimp --- CHANGELOG | 2 ++ Installation/MacOSX/Bundle/arangodb-cli.sh.in | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 6924d97f4a..3b46ce0a23 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ devel ----- +* fixed arangoimp script for MacOSX CLI Bundle + * added "peakMemoryUsage" in query results figures, showing the peak memory usage of the executed query. In a cluster, the value the peak memory usage of all shards, but it is not summed up across shards. diff --git a/Installation/MacOSX/Bundle/arangodb-cli.sh.in b/Installation/MacOSX/Bundle/arangodb-cli.sh.in index 71845ab844..dbb274f97f 100755 --- a/Installation/MacOSX/Bundle/arangodb-cli.sh.in +++ b/Installation/MacOSX/Bundle/arangodb-cli.sh.in @@ -19,6 +19,11 @@ SCRIPTS=$( cd "${ROOTDIR}@CMAKE_INSTALL_PREFIX@" && ls -1 {"@CMAKE_INSTALL_BINDI for script in $SCRIPTS; do base=$(basename "$script") + conf=$base + + if test $conf == "arangoimp"; then + conf=arangoimport + fi if test $base == "arangodb"; then cat > "${ROOTDIR}/$base.$$" <<-'EOF' @@ -52,7 +57,7 @@ EOF echo "export ROOTDIR=\"${ROOTDIR}@CMAKE_INSTALL_PREFIX@\"" echo - echo "exec \"\${ROOTDIR}/$script\" -c \"${ARANGOD_CONF_DIR}/${base}.conf\" \$*" + echo "exec \"\${ROOTDIR}/$script\" -c \"${ARANGOD_CONF_DIR}${conf}.conf\" \$*" ) > "${ROOTDIR}/$base.$$" fi