diff --git a/cli/src/assembly/resources/sbin/start-cli.bat b/cli/src/assembly/resources/sbin/start-cli.bat index 386878680203e5bc2855bccb2816c26c9f8e565b..d77b15d8e82b7ba3a014904d29e651ed4064dffe 100644 --- a/cli/src/assembly/resources/sbin/start-cli.bat +++ b/cli/src/assembly/resources/sbin/start-cli.bat @@ -25,7 +25,7 @@ if "%OS%" == "Windows_NT" setlocal pushd %~dp0.. -if NOT DEFINED IOTDB_CLI_HOME set IOTDB_CLI_HOME=%CD% +if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD% popd if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.cli.Cli @@ -34,10 +34,10 @@ if NOT DEFINED JAVA_HOME goto :err @REM ----------------------------------------------------------------------------- @REM JVM Opts we'll use in legacy run or installation set JAVA_OPTS=-ea^ - -DIOTDB_CLI_HOME="%IOTDB_CLI_HOME%" + -DIOTDB_HOME="%IOTDB_HOME%" -REM For each jar in the IOTDB_CLI_HOME lib directory call append to build the CLASSPATH variable. -set CLASSPATH="%IOTDB_CLI_HOME%\lib\*" +REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable. +set CLASSPATH="%IOTDB_HOME%\lib\*" REM ----------------------------------------------------------------------------- set PARAMETERS=%* diff --git a/cli/src/assembly/resources/sbin/start-cli.sh b/cli/src/assembly/resources/sbin/start-cli.sh index 4a736e963dedadc0bbece08a6cc7c3f27ed6b482..20fb4506a0273a069c4e5665736da48eefebad08 100644 --- a/cli/src/assembly/resources/sbin/start-cli.sh +++ b/cli/src/assembly/resources/sbin/start-cli.sh @@ -21,16 +21,17 @@ # You can put your env variable here # export JAVA_HOME=$JAVA_HOME -if [ -z "${IOTDB_CLI_HOME}" ]; then - export IOTDB_CLI_HOME="$(cd "`dirname "$0"`"/..; pwd)" +if [ -z "${IOTDB_HOME}" ]; then + export IOTDB_HOME="$(cd "`dirname "$0"`"/..; pwd)" fi +IOTDB_CLI_CONF=${IOTDB_HOME}/conf MAIN_CLASS=org.apache.iotdb.cli.Cli CLASSPATH="" -for f in ${IOTDB_CLI_HOME}/lib/*.jar; do +for f in ${IOTDB_HOME}/lib/*.jar; do CLASSPATH=${CLASSPATH}":"$f done @@ -76,7 +77,7 @@ esac # echo $PARAMETERS set -o noglob -exec "$JAVA" -cp "$CLASSPATH" "$MAIN_CLASS" $PARAMETERS - +iotdb_cli_params="-Dlogback.configurationFile=${IOTDB_CLI_CONF}/logback-cli.xml" +exec "$JAVA" $iotdb_cli_params -cp "$CLASSPATH" "$MAIN_CLASS" $PARAMETERS exit $? diff --git a/cli/src/assembly/resources/tools/export-csv.bat b/cli/src/assembly/resources/tools/export-csv.bat index 2514bf6d725a5c6f560574f445cc346e1193bbc2..44c43348a7ba9fc1fd5275296f1a1dc3bab6de66 100644 --- a/cli/src/assembly/resources/tools/export-csv.bat +++ b/cli/src/assembly/resources/tools/export-csv.bat @@ -25,7 +25,7 @@ echo ```````````````````````````````````````````````` if "%OS%" == "Windows_NT" setlocal pushd %~dp0.. -if NOT DEFINED IOTDB_CLI_HOME set IOTDB_CLI_HOME=%CD% +if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD% popd if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.ExportCsv @@ -34,14 +34,14 @@ if NOT DEFINED JAVA_HOME goto :err @REM ----------------------------------------------------------------------------- @REM JVM Opts we'll use in legacy run or installation set JAVA_OPTS=-ea^ - -DIOTDB_CLI_HOME=%IOTDB_CLI_HOME% + -DIOTDB_HOME=%IOTDB_HOME% @REM ***** CLASSPATH library setting ***** -set CLASSPATH=%IOTDB_CLI_HOME%\lib\* +set CLASSPATH=%IOTDB_HOME%\lib\* REM ----------------------------------------------------------------------------- -"%JAVA_HOME%\bin\java" -DIOTDB_CLI_HOME=%IOTDB_CLI_HOME% %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %* +"%JAVA_HOME%\bin\java" -DIOTDB_HOME=%IOTDB_HOME% %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %* goto finally diff --git a/cli/src/assembly/resources/tools/export-csv.sh b/cli/src/assembly/resources/tools/export-csv.sh index 375e461361214a03b0767792c35887f817545440..607a43ac2d580922c0cc7fd68462f51b8d750289 100644 --- a/cli/src/assembly/resources/tools/export-csv.sh +++ b/cli/src/assembly/resources/tools/export-csv.sh @@ -22,8 +22,8 @@ echo ------------------------------------------ echo Starting IoTDB Client Export Script echo ------------------------------------------ -if [ -z "${IOTDB_CLI_HOME}" ]; then - export IOTDB_CLI_HOME="$(cd "`dirname "$0"`"/..; pwd)" +if [ -z "${IOTDB_HOME}" ]; then + export IOTDB_HOME="$(cd "`dirname "$0"`"/..; pwd)" fi if [ -n "$JAVA_HOME" ]; then @@ -43,11 +43,11 @@ if [ -z $JAVA ] ; then fi CLASSPATH="" -for f in ${IOTDB_CLI_HOME}/lib/*.jar; do +for f in ${IOTDB_HOME}/lib/*.jar; do CLASSPATH=${CLASSPATH}":"$f done MAIN_CLASS=org.apache.iotdb.tool.ExportCsv -"$JAVA" -DIOTDB_CLI_HOME=${IOTDB_CLI_HOME} -cp "$CLASSPATH" "$MAIN_CLASS" "$@" +"$JAVA" -DIOTDB_HOME=${IOTDB_HOME} -cp "$CLASSPATH" "$MAIN_CLASS" "$@" exit $? \ No newline at end of file diff --git a/cli/src/assembly/resources/tools/import-csv.bat b/cli/src/assembly/resources/tools/import-csv.bat index c264bbf0015be95dd20d4fd036663b7626bf44b8..87d71ae70a61d05d810a39fdc6d2982359d34f8a 100644 --- a/cli/src/assembly/resources/tools/import-csv.bat +++ b/cli/src/assembly/resources/tools/import-csv.bat @@ -25,7 +25,7 @@ echo ```````````````````````````````````````````````` if "%OS%" == "Windows_NT" setlocal pushd %~dp0.. -if NOT DEFINED IOTDB_CLI_HOME set IOTDB_CLI_HOME=%CD% +if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD% popd if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.ImportCsv @@ -34,14 +34,14 @@ if NOT DEFINED JAVA_HOME goto :err @REM ----------------------------------------------------------------------------- @REM JVM Opts we'll use in legacy run or installation set JAVA_OPTS=-ea^ - -DIOTDB_CLI_HOME=%IOTDB_CLI_HOME% + -DIOTDB_HOME=%IOTDB_HOME% @REM ***** CLASSPATH library setting ***** -set CLASSPATH=%IOTDB_CLI_HOME%\lib\* +set CLASSPATH=%IOTDB_HOME%\lib\* REM ----------------------------------------------------------------------------- -"%JAVA_HOME%\bin\java" -DIOTDB_CLI_HOME=%IOTDB_CLI_HOME% %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %* +"%JAVA_HOME%\bin\java" -DIOTDB_HOME=%IOTDB_HOME% %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %* goto finally diff --git a/cli/src/assembly/resources/tools/import-csv.sh b/cli/src/assembly/resources/tools/import-csv.sh index 413dc4273431770023a4eaf6762681e4f189dc3f..6389816fdcd0973531d7fa758bc8bf5791be437a 100644 --- a/cli/src/assembly/resources/tools/import-csv.sh +++ b/cli/src/assembly/resources/tools/import-csv.sh @@ -22,8 +22,8 @@ echo ------------------------------------------ echo Starting IoTDB Client Import Script echo ------------------------------------------ -if [ -z "${IOTDB_CLI_HOME}" ]; then - export IOTDB_CLI_HOME="$(cd "`dirname "$0"`"/..; pwd)" +if [ -z "${IOTDB_HOME}" ]; then + export IOTDB_HOME="$(cd "`dirname "$0"`"/..; pwd)" fi if [ -n "$JAVA_HOME" ]; then @@ -43,11 +43,11 @@ if [ -z $JAVA ] ; then fi CLASSPATH="" -for f in ${IOTDB_CLI_HOME}/lib/*.jar; do +for f in ${IOTDB_HOME}/lib/*.jar; do CLASSPATH=${CLASSPATH}":"$f done MAIN_CLASS=org.apache.iotdb.tool.ImportCsv -"$JAVA" -DIOTDB_CLI_HOME=${IOTDB_CLI_HOME} -cp "$CLASSPATH" "$MAIN_CLASS" "$@" +"$JAVA" -DIOTDB_HOME=${IOTDB_HOME} -cp "$CLASSPATH" "$MAIN_CLASS" "$@" exit $? \ No newline at end of file