chore: support cus name (#616)

* chore: support cus name * fix: codacy errors
taosdata · Mar 14, 2023 · ad1a32b · ad1a32b
1 parent bbd74bf
commit ad1a32b
Show file tree

Hide file tree

Showing 9 changed files with 579 additions and 545 deletions.
diff --git a/.github/workflows/3.0-archlinux-release.yml b/.github/workflows/3.0-archlinux-release.yml
@@ -160,6 +160,7 @@ jobs:
         if: |
           (steps.changed-files-specific.outputs.any_changed == 'true'
           && github.event_name == 'pull_request')
+          || github.event_name == 'push'
         run: |
           git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge
           git checkout -qf FETCH_HEAD
@@ -179,5 +180,3 @@ jobs:
             echo "taos-tools build failure"
             exit 1
           fi
-
-
diff --git a/inc/bench.h b/inc/bench.h
@@ -240,7 +240,6 @@ typedef unsigned __int32 uint32_t;
 #define BENCH_DEBUG "Debug mode, optional."
 #define BENCH_PERFORMANCE "Performance mode, optional."
 #define BENCH_PREPARE "Random data source size, default is 10000."
-#define BENCH_EMAIL   "<support@taosdata.com>"
 #define BENCH_VGROUPS "Specify Vgroups number for creating database, "    \
                         "only valid with daemon version 3.0+"
 #define BENCH_VERSION "Print program version."

diff --git a/packaging/tools/install-taostools.sh → packaging/tools/install-tools.sh b/packaging/tools/install-taostools.sh → packaging/tools/install-tools.sh
@@ -105,7 +105,7 @@ function install_bin() {
 
     ${csudo}/usr/bin/install -c -m 755 ${script_dir}/bin/${dumpName} ${install_main_dir}/bin/${dumpName} || echo -e "${RED}${dumpName}not installed${NC}"
     ${csudo}/usr/bin/install -c -m 755 ${script_dir}/bin/${benchmarkName} ${install_main_dir}/bin/${benchmarkName} || echo -e "${RED}${benchmarkName}not installed${NC}"
-    ${csudo}/usr/bin/install -c -m 755 ${script_dir}/uninstall-${toolsName}.sh ${install_main_dir}/bin/uninstall-${toolsName}.sh || echo -e "${RED}uninstall-${toolsName}not installed${NC}"
+    ${csudo}/usr/bin/install -c -m 755 ${script_dir}/uninstall-tools.sh ${install_main_dir}/bin/uninstall-tools.sh || echo -e "${RED}uninstall-tools not installed${NC}"
     #Make link
     [[ -x ${install_main_dir}/bin/${benchmarkName} ]] && \
         ${csudo}ln -sf ${install_main_dir}/bin/${benchmarkName} ${install_main_dir}/bin/${demoName}     || :
@@ -115,13 +115,13 @@ function install_bin() {
         ${csudo}ln -s ${install_main_dir}/bin/${demoName} ${bin_link_dir}/${demoName}                   || :
     [[ -x ${install_main_dir}/bin/${dumpName} ]] && \
         ${csudo}ln -s ${install_main_dir}/bin/${dumpName} ${bin_link_dir}/${dumpName}                   || :
-    [[ -x ${install_main_dir}/bin/uninstall-${toolsName}.sh ]] && \
-        ${csudo}ln -s ${install_main_dir}/bin/uninstall-${toolsName}.sh ${bin_link_dir}/rm${toolsName}  || :
+    [[ -x ${install_main_dir}/bin/uninstall-tools.sh ]] && \
+        ${csudo}ln -s ${install_main_dir}/bin/uninstall-tools.sh ${bin_link_dir}/rm${toolsName}         || :
 }
 
 function install_taostools() {
     # Start to install
-    echo -e "${GREEN}Start to install ${taosName} tools ...${NC}"
+    echo -e "${GREEN}Start to install tools ...${NC}"
 
     install_main_path
 
@@ -130,7 +130,7 @@ function install_taostools() {
     install_libtaosws
 
     echo
-    echo -e "${GREEN}${taosName} tools is installed successfully!${NC}"
+    echo -e "${GREEN}tools is installed successfully!${NC}"
 }
 
 ## ==============================Main program starts from here============================

diff --git a/packaging/tools/uninstall-taostools.sh → packaging/tools/uninstall-tools.sh b/packaging/tools/uninstall-taostools.sh → packaging/tools/uninstall-tools.sh
@@ -50,16 +50,16 @@ function uninstall_bin() {
     ${csudo}rm -f ${bin_link_dir}/${dumpName}         || :
     ${csudo}rm -f ${bin_link_dir}/rm${toolsName}      || :
 
-    ${csudo}rm -f ${install_main_dir}/bin/${demoName}                  || :
-    ${csudo}rm -f ${install_main_dir}/bin/${benchmarkName}             || :
-    ${csudo}rm -f ${install_main_dir}/bin/${dumpName}                  || :
-    ${csudo}rm -f ${install_main_dir}/bin/uninstall-${toolsName}.sh    || :
+    ${csudo}rm -f ${install_main_dir}/bin/${demoName}               || :
+    ${csudo}rm -f ${install_main_dir}/bin/${benchmarkName}          || :
+    ${csudo}rm -f ${install_main_dir}/bin/${dumpName}               || :
+    ${csudo}rm -f "${install_main_dir}/bin/uninstall-tools.sh"      || :
 }
 
 
 function uninstall_taostools() {
     # Start to uninstall
-    echo -e "${GREEN}Start to uninstall ${taosName} tools ...${NC}"
+    echo -e "${GREEN}Start to uninstall tools ...${NC}"
 
     kill_process ${demoName}
     kill_process ${benchmarkName}
@@ -69,7 +69,7 @@ function uninstall_taostools() {
     uninstall_libtaosws
 
     echo
-    echo -e "${GREEN}${taosName} tools is uninstalled successfully!${NC}"
+    echo -e "${GREEN}tools is uninstalled successfully!${NC}"
 }
 
 ## ==============================Main program starts from here============================

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -166,6 +166,10 @@ ENDIF ()
 
 MESSAGE("Current system is: ${CMAKE_SYSTEM_NAME}")
 
+IF (CUS_NAME OR CUS_PROMPT OR CUS_EMAIL)
+    ADD_DEFINITIONS(-I${CMAKE_CURRENT_SOURCE_DIR}/../../../../enterprise/packaging)
+ENDIF (CUS_NAME OR CUS_PROMPT OR CUS_EMAIL)
+
 IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     SET(OS_ID "")