From 407bbe0b7b98590fc55025995c59e229f40e62d6 Mon Sep 17 00:00:00 2001
From: Yingchun Lai <laiyingchun@apache.org>
Date: Mon, 23 Sep 2024 17:53:48 +0800
Subject: [PATCH] update paths

---
 .github/actions/rebuild_thirdparty_if_needed/action.yaml | 4 ++--
 {build_tools => admin_tools}/download_hadoop.sh          | 0
 {build_tools => admin_tools}/download_package.sh         | 0
 {build_tools => admin_tools}/download_zk.sh              | 0
 build_tools/start_zk.sh                                  | 2 +-
 docker/thirdparties-bin/Dockerfile                       | 4 ++--
 run.sh                                                   | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename {build_tools => admin_tools}/download_hadoop.sh (100%)
 rename {build_tools => admin_tools}/download_package.sh (100%)
 rename {build_tools => admin_tools}/download_zk.sh (100%)

diff --git a/.github/actions/rebuild_thirdparty_if_needed/action.yaml b/.github/actions/rebuild_thirdparty_if_needed/action.yaml
index 2a5a2cf1b0..d0ebc3fbf0 100644
--- a/.github/actions/rebuild_thirdparty_if_needed/action.yaml
+++ b/.github/actions/rebuild_thirdparty_if_needed/action.yaml
@@ -42,8 +42,8 @@ runs:
         cmake --build build/ -j $(nproc)
         rm -rf build/Build build/Download/[a-y]* build/Source/[a-g]* build/Source/[i-q]* build/Source/[s-z]*
         find ./ -name '*CMakeFiles*' -type d -exec rm -rf "{}" +
-        ../build_tools/download_hadoop.sh hadoop-bin
-        ../build_tools/download_zk.sh zookeeper-bin
+        ../admin_tools/download_hadoop.sh hadoop-bin
+        ../admin_tools/download_zk.sh zookeeper-bin
         rm -rf hadoop-bin/share/doc
         rm -rf zookeeper-bin/docs
         mv hadoop-bin ..
diff --git a/build_tools/download_hadoop.sh b/admin_tools/download_hadoop.sh
similarity index 100%
rename from build_tools/download_hadoop.sh
rename to admin_tools/download_hadoop.sh
diff --git a/build_tools/download_package.sh b/admin_tools/download_package.sh
similarity index 100%
rename from build_tools/download_package.sh
rename to admin_tools/download_package.sh
diff --git a/build_tools/download_zk.sh b/admin_tools/download_zk.sh
similarity index 100%
rename from build_tools/download_zk.sh
rename to admin_tools/download_zk.sh
diff --git a/build_tools/start_zk.sh b/build_tools/start_zk.sh
index 2bc37356b0..66195e6c47 100755
--- a/build_tools/start_zk.sh
+++ b/build_tools/start_zk.sh
@@ -48,7 +48,7 @@ cd "$INSTALL_DIR" || exit
 ZOOKEEPER_HOME=`pwd`/apache-zookeeper-3.7.0-bin
 
 if [ ! -d "${ZOOKEEPER_HOME}" ]; then
-    ${CWD}/download_zk.sh zookeeper-bin
+    ${CWD}/../admin_tools/download_zk.sh zookeeper-bin
     ZOOKEEPER_HOME=`pwd`/zookeeper-bin
 fi
 
diff --git a/docker/thirdparties-bin/Dockerfile b/docker/thirdparties-bin/Dockerfile
index f080da3f03..100da6d872 100644
--- a/docker/thirdparties-bin/Dockerfile
+++ b/docker/thirdparties-bin/Dockerfile
@@ -35,8 +35,8 @@ RUN git clone --depth=1 --branch=${GITHUB_BRANCH} ${GITHUB_REPOSITORY_URL} \
     && unzip /root/thirdparties-src.zip -d . \
     && cmake -DCMAKE_BUILD_TYPE=Release -DROCKSDB_PORTABLE=${ROCKSDB_PORTABLE} -DUSE_JEMALLOC=${USE_JEMALLOC} -B build/ . \
     && cmake --build build/ -j $(($(nproc)/2+1)) \
-    && ../build_tools/download_hadoop.sh ${HADOOP_BIN_PATH} \
-    && ../build_tools/download_zk.sh ${ZOOKEEPER_BIN_PATH} \
+    && ../admin_tools/download_hadoop.sh ${HADOOP_BIN_PATH} \
+    && ../admin_tools/download_zk.sh ${ZOOKEEPER_BIN_PATH} \
     && zip -r ~/thirdparties-bin.zip output/ build/Source/rocksdb/cmake build/Source/http-parser build/Source/hadoop build/Download/zookeeper ${HADOOP_BIN_PATH} ${ZOOKEEPER_BIN_PATH} \
     && cd ~ \
     && rm -rf incubator-pegasus;
diff --git a/run.sh b/run.sh
index 67f33d9d90..0426bf5770 100755
--- a/run.sh
+++ b/run.sh
@@ -2107,7 +2107,7 @@ case $cmd in
     pack_server)
         shift
         # source the config_hdfs.sh to get the HADOOP_HOME.
-        source "${ROOT}"/scripts/config_hdfs.sh
+        source "${ROOT}"/admin_tools/config_hdfs.sh
         PEGASUS_ROOT=$ROOT ./build_tools/pack_server.sh $*
         ;;
     pack_client)