This is an automated email from the ASF dual-hosted git repository.
okumin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new acda3d0e1d6 HIVE-28937: Static analysis issues fixed in shell scripts
(#5797)
acda3d0e1d6 is described below
commit acda3d0e1d6e5ec23648a8337c988cddad7e4183
Author: Raviteja Lokineni <[email protected]>
AuthorDate: Sat May 10 04:04:36 2025 -0400
HIVE-28937: Static analysis issues fixed in shell scripts (#5797)
More info:
- https://github.com/koalaman/shellcheck/wiki/SC2086
- https://github.com/koalaman/shellcheck/wiki/SC2125
- https://github.com/koalaman/shellcheck/wiki/SC2223
Signed-off-by: Raviteja Lokineni <[email protected]>
---
packaging/src/docker/build.sh | 2 +-
packaging/src/docker/entrypoint.sh | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/packaging/src/docker/build.sh b/packaging/src/docker/build.sh
index c96b58552c6..9e932ead6df 100755
--- a/packaging/src/docker/build.sh
+++ b/packaging/src/docker/build.sh
@@ -110,7 +110,7 @@ if [ -n "$HIVE_VERSION" ]; then
else
HIVE_VERSION=$(mvn -f "$SOURCE_DIR/pom.xml" -q help:evaluate
-Dexpression=project.version -DforceStdout)
HIVE_TAR="$SOURCE_DIR/packaging/target/apache-hive-$HIVE_VERSION-bin.tar.gz"
- if ls $HIVE_TAR || mvn -f $SOURCE_DIR/pom.xml clean package -DskipTests
-Pdist; then
+ if ls "$HIVE_TAR" || mvn -f "$SOURCE_DIR/pom.xml" clean package -DskipTests
-Pdist; then
cp "$HIVE_TAR" "$WORK_DIR/"
else
echo "Failed to compile Hive Project, exiting..."
diff --git a/packaging/src/docker/entrypoint.sh
b/packaging/src/docker/entrypoint.sh
index 5d44d563170..7b1b70b37b3 100644
--- a/packaging/src/docker/entrypoint.sh
+++ b/packaging/src/docker/entrypoint.sh
@@ -19,7 +19,7 @@
set -x
-: ${DB_DRIVER:=derby}
+: "${DB_DRIVER:=derby}"
SKIP_SCHEMA_INIT="${IS_RESUME:-false}"
[[ $VERBOSE = "true" ]] && VERBOSE_MODE="--verbose" || VERBOSE_MODE=""
@@ -29,7 +29,7 @@ function initialize_hive {
if [ "$(echo "$HIVE_VER" | cut -d '.' -f1)" -lt "4" ]; then
COMMAND="-${SCHEMA_COMMAND:-initSchema}"
fi
- $HIVE_HOME/bin/schematool -dbType $DB_DRIVER $COMMAND $VERBOSE_MODE
+ "$HIVE_HOME/bin/schematool" -dbType "$DB_DRIVER" "$COMMAND" "$VERBOSE_MODE"
if [ $? -eq 0 ]; then
echo "Initialized Hive Metastore Server schema successfully.."
else
@@ -53,9 +53,9 @@ if [[ "${SKIP_SCHEMA_INIT}" == "false" ]]; then
fi
if [ "${SERVICE_NAME}" == "hiveserver2" ]; then
- export HADOOP_CLASSPATH=$TEZ_HOME/*:$TEZ_HOME/lib/*:$HADOOP_CLASSPATH
- exec $HIVE_HOME/bin/hive --skiphadoopversion --skiphbasecp --service
$SERVICE_NAME
+ export HADOOP_CLASSPATH="$TEZ_HOME/*:$TEZ_HOME/lib/*:$HADOOP_CLASSPATH"
+ exec "$HIVE_HOME/bin/hive" --skiphadoopversion --skiphbasecp --service
"$SERVICE_NAME"
elif [ "${SERVICE_NAME}" == "metastore" ]; then
export METASTORE_PORT=${METASTORE_PORT:-9083}
- exec $HIVE_HOME/bin/hive --skiphadoopversion --skiphbasecp $VERBOSE_MODE
--service $SERVICE_NAME
+ exec "$HIVE_HOME/bin/hive" --skiphadoopversion --skiphbasecp "$VERBOSE_MODE"
--service "$SERVICE_NAME"
fi
