Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use some changes from 1.0

This commit is contained in:
Jan Steemann 2012-07-26 11:29:27 +02:00
parent 17fc10d85b
commit 6fb3db25cb
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/arango-password.in
View File

@ -21,9 +21,21 @@ if [ "$1" == "--database" ] || [ "$1" == "--database.directory" ] ; then
DATABASE="$1"
shift
fi
echo $DATABASE
if [ "$#" -lt 2 ]; then
$ARANGOD -c none --database.directory "$DATABASE" --javascript.script "$SCRIPT" --javascript.script-parameter "$1"
else
$ARANGOD -c none --database.directory "$DATABASE" --javascript.script "$SCRIPT" --javascript.script-parameter "$1" --javascript.script-parameter "$2"
if test ! -d "$DATABASE"; then
echo "$0: database directory '$DATABASE' does not exist"
exit 1
fi
USER="$1"
if echo "$USER" | grep -q "[^a-zA-Z0-0_-]"; then
echo "$0: username '$USER' should only contain letters, numbers, underscore and minus"
exit 1
fi
if [ "$#" -lt 2 ]; then
$ARANGOD -c none --database.directory "$DATABASE" --javascript.script "$SCRIPT" --javascript.script-parameter "$USER"
else
$ARANGOD -c none --database.directory "$DATABASE" --javascript.script "$SCRIPT" --javascript.script-parameter "$USER" --javascript.script-parameter "$2"
fi

14
configure vendored
View File

@ -754,6 +754,8 @@ build_cpu
build
ENABLE_RELATIVE_DEVEL_FALSE
ENABLE_RELATIVE_DEVEL_TRUE
ENABLE_RELATIVE_SYSTEM_FALSE
ENABLE_RELATIVE_SYSTEM_TRUE
ENABLE_INSTALL_DBDIR_FALSE
ENABLE_INSTALL_DBDIR_TRUE
ENABLE_BOOST_TEST_FALSE
@ -2645,6 +2647,14 @@ else
fi
fi
if test "x$tr_RELATIVE" = xyes; then
ENABLE_RELATIVE_SYSTEM_TRUE=
ENABLE_RELATIVE_SYSTEM_FALSE='#'
else
ENABLE_RELATIVE_SYSTEM_TRUE='#'
ENABLE_RELATIVE_SYSTEM_FALSE=
fi
if test "x$tr_RELATIVE" = xdevel; then
ENABLE_RELATIVE_DEVEL_TRUE=
ENABLE_RELATIVE_DEVEL_FALSE='#'
@ -9736,6 +9746,10 @@ if test -z "${ENABLE_INSTALL_DBDIR_TRUE}" && test -z "${ENABLE_INSTALL_DBDIR_FAL
as_fn_error $? "conditional \"ENABLE_INSTALL_DBDIR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_RELATIVE_SYSTEM_TRUE}" && test -z "${ENABLE_RELATIVE_SYSTEM_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_RELATIVE_SYSTEM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_RELATIVE_DEVEL_TRUE}" && test -z "${ENABLE_RELATIVE_DEVEL_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_RELATIVE_DEVEL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5

1
configure.ac
View File

@ -130,6 +130,7 @@ else
fi
fi
AM_CONDITIONAL(ENABLE_RELATIVE_SYSTEM, test "x$tr_RELATIVE" = xyes)
AM_CONDITIONAL(ENABLE_RELATIVE_DEVEL, test "x$tr_RELATIVE" = xdevel)
dnl ============================================================================