diff --git a/packaging/tools/makearbi.sh b/packaging/tools/makearbi.sh index bc6179eff2de84086144ef20aae5b5dde00b6470..82808bcae962b2c90d1811d512e18c90419f7211 100755 --- a/packaging/tools/makearbi.sh +++ b/packaging/tools/makearbi.sh @@ -25,9 +25,9 @@ release_dir="${top_dir}/release" #package_name='linux' if [ "$verMode" == "cluster" ]; then - install_dir="${release_dir}/TDengine-enterprise-arbitrator" + install_dir="${release_dir}/TDengine-enterprise-arbitrator-${version}" else - install_dir="${release_dir}/TDengine-arbitrator" + install_dir="${release_dir}/TDengine-arbitrator-${version}" fi # Directories and files. @@ -48,9 +48,9 @@ mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir} cd ${release_dir} if [ "$verMode" == "cluster" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} elif [ "$verMode" == "edge" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} else echo "unknow verMode, nor cluster or edge" exit 1 diff --git a/packaging/tools/makearbi_power.sh b/packaging/tools/makearbi_power.sh index 5296cc8e3f334c0ed0f8e5ca30137e367b021929..fd50ecd43878de08e7bb94249da8cb64c3630e6e 100755 --- a/packaging/tools/makearbi_power.sh +++ b/packaging/tools/makearbi_power.sh @@ -25,9 +25,9 @@ release_dir="${top_dir}/release" #package_name='linux' if [ "$verMode" == "cluster" ]; then - install_dir="${release_dir}/PowerDB-enterprise-arbitrator" + install_dir="${release_dir}/PowerDB-enterprise-arbitrator-${version}" else - install_dir="${release_dir}/PowerDB-arbitrator" + install_dir="${release_dir}/PowerDB-arbitrator-${version}" fi # Directories and files. @@ -48,9 +48,9 @@ mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir} cd ${release_dir} if [ "$verMode" == "cluster" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} elif [ "$verMode" == "edge" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} else echo "unknow verMode, nor cluster or edge" exit 1 diff --git a/packaging/tools/makeclient.sh b/packaging/tools/makeclient.sh index d69a8e6007cb3b7c57214a2cbab555059c757526..e17c678f263cb6b7a0ccbc32250265b9bc5cbd0e 100755 --- a/packaging/tools/makeclient.sh +++ b/packaging/tools/makeclient.sh @@ -32,9 +32,9 @@ release_dir="${top_dir}/release" #package_name='linux' if [ "$verMode" == "cluster" ]; then - install_dir="${release_dir}/TDengine-enterprise-client" + install_dir="${release_dir}/TDengine-enterprise-client-${version}" else - install_dir="${release_dir}/TDengine-client" + install_dir="${release_dir}/TDengine-client-${version}" fi # Directories and files. @@ -125,9 +125,9 @@ fi cd ${release_dir} if [ "$verMode" == "cluster" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} elif [ "$verMode" == "edge" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} else echo "unknow verMode, nor cluster or edge" exit 1 diff --git a/packaging/tools/makeclient_power.sh b/packaging/tools/makeclient_power.sh index d4be52f67911ee22f6d914cdc6bc6de9c7b0fb06..b4416a68bb30751d5e9b02f5e83186d750d5a935 100755 --- a/packaging/tools/makeclient_power.sh +++ b/packaging/tools/makeclient_power.sh @@ -32,9 +32,9 @@ release_dir="${top_dir}/release" #package_name='linux' if [ "$verMode" == "cluster" ]; then - install_dir="${release_dir}/PowerDB-enterprise-client" + install_dir="${release_dir}/PowerDB-enterprise-client-${version}" else - install_dir="${release_dir}/PowerDB-client" + install_dir="${release_dir}/PowerDB-client-${version}" fi # Directories and files. @@ -164,9 +164,9 @@ fi cd ${release_dir} if [ "$verMode" == "cluster" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} elif [ "$verMode" == "edge" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} else echo "unknow verMode, nor cluster or edge" exit 1 diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh index 3958cff53b414d7f1b045d9e73bcfd373d09dbe3..75b45b544e0a4abbf709cc4c5b3a3b55dc315f0f 100755 --- a/packaging/tools/makepkg.sh +++ b/packaging/tools/makepkg.sh @@ -25,9 +25,9 @@ release_dir="${top_dir}/release" #package_name='linux' if [ "$verMode" == "cluster" ]; then - install_dir="${release_dir}/TDengine-enterprise-server" + install_dir="${release_dir}/TDengine-enterprise-server-${version}" else - install_dir="${release_dir}/TDengine-server" + install_dir="${release_dir}/TDengine-server-${version}" fi # Directories and files. @@ -138,9 +138,9 @@ fi cd ${release_dir} if [ "$verMode" == "cluster" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} elif [ "$verMode" == "edge" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} else echo "unknow verMode, nor cluster or edge" exit 1 diff --git a/packaging/tools/makepkg_power.sh b/packaging/tools/makepkg_power.sh index 744f78e514611125bd0ecce1d53e5534656924c9..3d625900c9d912ff835092c7c5675d618b42b06d 100755 --- a/packaging/tools/makepkg_power.sh +++ b/packaging/tools/makepkg_power.sh @@ -25,9 +25,9 @@ release_dir="${top_dir}/release" #package_name='linux' if [ "$verMode" == "cluster" ]; then - install_dir="${release_dir}/PowerDB-enterprise-server" + install_dir="${release_dir}/PowerDB-enterprise-server-${version}" else - install_dir="${release_dir}/PowerDB-server" + install_dir="${release_dir}/PowerDB-server-${version}" fi # Directories and files. @@ -184,9 +184,9 @@ fi cd ${release_dir} if [ "$verMode" == "cluster" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} elif [ "$verMode" == "edge" ]; then - pkg_name=${install_dir}-${version}-${osType}-${cpuType} + pkg_name=${install_dir}-${osType}-${cpuType} else echo "unknow verMode, nor cluster or edge" exit 1