diff --git a/cmake/cmake.install b/cmake/cmake.install index 07773d1015f91dd39d7ad83c2c681857bc4777b9..4e3d0b166aba447cf48fb664f429a885caece953 100644 --- a/cmake/cmake.install +++ b/cmake/cmake.install @@ -1,4 +1,8 @@ -IF (TD_LINUX) +IF (EXISTS /var/lib/taos/dnode/dnodeCfg.json) + INSTALL(CODE "MESSAGE(\"The default data directory /var/lib/taos contains old data of tdengine 2.x, please clear it before installing!\")") +ELSEIF (EXISTS C:/TDengine/data/dnode/dnodeCfg.json) + INSTALL(CODE "MESSAGE(\"The default data directory C:/TDengine/data contains old data of tdengine 2.x, please clear it before installing!\")") +ELSEIF (TD_LINUX) SET(TD_MAKE_INSTALL_SH "${TD_SOURCE_DIR}/packaging/tools/make_install.sh") INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")") INSTALL(CODE "execute_process(COMMAND bash ${TD_MAKE_INSTALL_SH} ${TD_SOURCE_DIR} ${PROJECT_BINARY_DIR} Linux ${TD_VER_NUMBER})") diff --git a/packaging/deb/DEBIAN/control b/packaging/deb/DEBIAN/control index fd3f81ba082d11f6ff3979382a63597b5806fa1f..a2005be138ea5d41d5e96d17df53d1b73b59b533 100644 --- a/packaging/deb/DEBIAN/control +++ b/packaging/deb/DEBIAN/control @@ -1,5 +1,5 @@ Package: tdengine -Version: 1.0.0 +Version: 3.0.0 Section: utils Priority: optional #Essential: no diff --git a/packaging/deb/DEBIAN/preinst b/packaging/deb/DEBIAN/preinst index 184653991c719e24dbbb19f8441cc2103443b622..8a1a7d4d8160c0680d2492699e3d8c4a5709b096 100644 --- a/packaging/deb/DEBIAN/preinst +++ b/packaging/deb/DEBIAN/preinst @@ -1,5 +1,10 @@ #!/bin/bash +if [ -f /var/lib/taos/dnode/dnodeCfg.json ]; then + echo -e "The default data directory \033[41;37m/var/lib/taos\033[0m contains old data of tdengine 2.x, please clear it before installing!" + exit 1 +fi + csudo="" if command -v sudo > /dev/null; then csudo="sudo " diff --git a/packaging/deb/DEBIAN/prerm b/packaging/deb/DEBIAN/prerm index 14c814eb839cd49fac566fde10a39f7b5d800962..5676bf5c4324a340aab09c18c59636d4fc80d43c 100644 --- a/packaging/deb/DEBIAN/prerm +++ b/packaging/deb/DEBIAN/prerm @@ -1,5 +1,9 @@ #!/bin/bash +if [ $1 -eq "abort-upgrade" ]; then + exit 0 +fi + insmetaPath="/usr/local/taos/script" csudo="" diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec index d3d4bab0e697f10a4f1824931206cf53fd11d07b..7a34f7a222b13b5e91a88297428df3f425960309 100644 --- a/packaging/rpm/tdengine.spec +++ b/packaging/rpm/tdengine.spec @@ -132,6 +132,10 @@ fi #Scripts executed before installation %pre +if [ -f /var/lib/taos/dnode/dnodeCfg.json ]; then + echo -e "The default data directory \033[41;37m/var/lib/taos\033[0m contains old data of tdengine 2.x, please clear it before installing!" + exit 1 +fi csudo="" if command -v sudo > /dev/null; then csudo="sudo "