remote web from installation package

taosdata · Jul 21, 2023 · 282bbfc · 282bbfc
1 parent 35e51cb
commit 282bbfc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 28 deletions.
diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
@@ -613,12 +613,6 @@ function install_examples() {
   fi
 }
 
-function install_web() {
-  if [ -d "${script_dir}/share" ]; then
-    ${csudo}cp -rf ${script_dir}/share/* ${install_main_dir}/share > /dev/null 2>&1 ||:
-  fi
-}
-
 
 function clean_service_on_sysvinit() {
   if ps aux | grep -v grep | grep ${serverName2} &>/dev/null; then
@@ -894,7 +888,6 @@ function updateProduct() {
   fi
 
   install_examples
-  install_web
   if [ -z $1 ]; then
     install_bin
     install_service
@@ -971,8 +964,7 @@ function installProduct() {
   if [ "$verMode" == "cluster" ]; then
       install_connector
   fi
-  install_examples
-  install_web
+  install_examples  
 
   if [ -z $1 ]; then # install service and client
     # For installing new

diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
@@ -432,12 +432,6 @@ function install_examples() {
   ${csudo}cp -rf ${source_dir}/examples/* ${install_main_dir}/examples || :
 }
 
-function install_web() {
-  if [ -d "${binary_dir}/build/share" ]; then
-    ${csudo}cp -rf ${binary_dir}/build/share/* ${install_main_dir}/share || :
-  fi
-}
-
 function clean_service_on_sysvinit() {
   if ps aux | grep -v grep | grep ${serverName} &>/dev/null; then
     ${csudo}service ${serverName} stop || :
@@ -592,7 +586,6 @@ function update_TDengine() {
   install_lib
   #  install_connector
   install_examples
-  install_web
   install_bin
   install_app
 

diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
@@ -126,7 +126,6 @@ else
 fi
 
 install_files="${script_dir}/install.sh"
-web_dir="${top_dir}/../enterprise/src/plugins/web"
 
 init_file_deb=${script_dir}/../deb/taosd
 init_file_rpm=${script_dir}/../rpm/taosd
@@ -320,17 +319,6 @@ if [[ $dbName == "taos" ]]; then
     mkdir -p ${install_dir}/examples/taosbenchmark-json && cp ${examples_dir}/../tools/taos-tools/example/* ${install_dir}/examples/taosbenchmark-json
   fi
 
-  # Add web files
-  if [ "$verMode" == "cluster" ] || [ "$verMode" == "cloud" ]; then
-    if [ -d "${web_dir}/admin" ] ; then
-      mkdir -p ${install_dir}/share/
-      cp -Rfap ${web_dir}/admin ${install_dir}/share/
-      cp ${web_dir}/png/taos.png ${install_dir}/share/admin/images/taos.png
-      cp -rf ${build_dir}/share/{etc,srv} ${install_dir}/share ||:
-    else
-      echo "directory not found for enterprise release: ${web_dir}/admin"
-    fi
-  fi
 fi
 
 # Copy driver