You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/01/21 08:06:46 UTC
[iotdb] 01/01: Revert "[env] rename IOTDB_CLI_HOME to IOTDB_HOME (#4944)"
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch revert-4944-fix/iotdb-cli
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ed530d92e58d1f5b4b7338bd5ee0e181872012f4
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Fri Jan 21 16:06:13 2022 +0800
Revert "[env] rename IOTDB_CLI_HOME to IOTDB_HOME (#4944)"
This reverts commit 11b18d6749c5f53605d0e9843bbb801a6619a544.
---
cli/src/assembly/resources/sbin/start-cli.bat | 8 ++++----
cli/src/assembly/resources/sbin/start-cli.sh | 11 +++++------
cli/src/assembly/resources/tools/export-csv.bat | 8 ++++----
cli/src/assembly/resources/tools/export-csv.sh | 8 ++++----
cli/src/assembly/resources/tools/import-csv.bat | 8 ++++----
cli/src/assembly/resources/tools/import-csv.sh | 8 ++++----
6 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/cli/src/assembly/resources/sbin/start-cli.bat b/cli/src/assembly/resources/sbin/start-cli.bat
index d77b15d..3868786 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_HOME set IOTDB_HOME=%CD%
+if NOT DEFINED IOTDB_CLI_HOME set IOTDB_CLI_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_HOME="%IOTDB_HOME%"
+ -DIOTDB_CLI_HOME="%IOTDB_CLI_HOME%"
-REM For each jar in the IOTDB_HOME lib directory call append to build the CLASSPATH variable.
-set CLASSPATH="%IOTDB_HOME%\lib\*"
+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 -----------------------------------------------------------------------------
set PARAMETERS=%*
diff --git a/cli/src/assembly/resources/sbin/start-cli.sh b/cli/src/assembly/resources/sbin/start-cli.sh
index 20fb450..4a736e9 100644
--- a/cli/src/assembly/resources/sbin/start-cli.sh
+++ b/cli/src/assembly/resources/sbin/start-cli.sh
@@ -21,17 +21,16 @@
# You can put your env variable here
# export JAVA_HOME=$JAVA_HOME
-if [ -z "${IOTDB_HOME}" ]; then
- export IOTDB_HOME="$(cd "`dirname "$0"`"/..; pwd)"
+if [ -z "${IOTDB_CLI_HOME}" ]; then
+ export IOTDB_CLI_HOME="$(cd "`dirname "$0"`"/..; pwd)"
fi
-IOTDB_CLI_CONF=${IOTDB_HOME}/conf
MAIN_CLASS=org.apache.iotdb.cli.Cli
CLASSPATH=""
-for f in ${IOTDB_HOME}/lib/*.jar; do
+for f in ${IOTDB_CLI_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
@@ -77,7 +76,7 @@ esac
# echo $PARAMETERS
set -o noglob
-iotdb_cli_params="-Dlogback.configurationFile=${IOTDB_CLI_CONF}/logback-cli.xml"
-exec "$JAVA" $iotdb_cli_params -cp "$CLASSPATH" "$MAIN_CLASS" $PARAMETERS
+exec "$JAVA" -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 44c4334..2514bf6 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_HOME set IOTDB_HOME=%CD%
+if NOT DEFINED IOTDB_CLI_HOME set IOTDB_CLI_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_HOME=%IOTDB_HOME%
+ -DIOTDB_CLI_HOME=%IOTDB_CLI_HOME%
@REM ***** CLASSPATH library setting *****
-set CLASSPATH=%IOTDB_HOME%\lib\*
+set CLASSPATH=%IOTDB_CLI_HOME%\lib\*
REM -----------------------------------------------------------------------------
-"%JAVA_HOME%\bin\java" -DIOTDB_HOME=%IOTDB_HOME% %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %*
+"%JAVA_HOME%\bin\java" -DIOTDB_CLI_HOME=%IOTDB_CLI_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 607a43a..375e461 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_HOME}" ]; then
- export IOTDB_HOME="$(cd "`dirname "$0"`"/..; pwd)"
+if [ -z "${IOTDB_CLI_HOME}" ]; then
+ export IOTDB_CLI_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_HOME}/lib/*.jar; do
+for f in ${IOTDB_CLI_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
MAIN_CLASS=org.apache.iotdb.tool.ExportCsv
-"$JAVA" -DIOTDB_HOME=${IOTDB_HOME} -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
+"$JAVA" -DIOTDB_CLI_HOME=${IOTDB_CLI_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 87d71ae..c264bbf 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_HOME set IOTDB_HOME=%CD%
+if NOT DEFINED IOTDB_CLI_HOME set IOTDB_CLI_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_HOME=%IOTDB_HOME%
+ -DIOTDB_CLI_HOME=%IOTDB_CLI_HOME%
@REM ***** CLASSPATH library setting *****
-set CLASSPATH=%IOTDB_HOME%\lib\*
+set CLASSPATH=%IOTDB_CLI_HOME%\lib\*
REM -----------------------------------------------------------------------------
-"%JAVA_HOME%\bin\java" -DIOTDB_HOME=%IOTDB_HOME% %JAVA_OPTS% -cp %CLASSPATH% %MAIN_CLASS% %*
+"%JAVA_HOME%\bin\java" -DIOTDB_CLI_HOME=%IOTDB_CLI_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 6389816..413dc42 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_HOME}" ]; then
- export IOTDB_HOME="$(cd "`dirname "$0"`"/..; pwd)"
+if [ -z "${IOTDB_CLI_HOME}" ]; then
+ export IOTDB_CLI_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_HOME}/lib/*.jar; do
+for f in ${IOTDB_CLI_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
MAIN_CLASS=org.apache.iotdb.tool.ImportCsv
-"$JAVA" -DIOTDB_HOME=${IOTDB_HOME} -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
+"$JAVA" -DIOTDB_CLI_HOME=${IOTDB_CLI_HOME} -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
exit $?
\ No newline at end of file