From 79389aaaaf1912180d0aecfb0b7b7f8c49213328 Mon Sep 17 00:00:00 2001
From: Frozen <xrdavies@gmail.com>
Date: Fri, 20 Dec 2019 11:47:09 +0800
Subject: [PATCH] fix issue of readlink

---
 packaging/deb/makedeb.sh          | 2 +-
 packaging/release.sh              | 2 +-
 packaging/rpm/makerpm.sh          | 2 +-
 packaging/tools/install.sh        | 2 +-
 packaging/tools/install_client.sh | 2 +-
 packaging/tools/make_install.sh   | 2 +-
 packaging/tools/makeclient.sh     | 2 +-
 packaging/tools/makepkg.sh        | 2 +-
 packaging/tools/post.sh           | 2 +-
 packaging/tools/repair_link.sh    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh
index 5c2df734fa..1cd45cfb97 100755
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
@@ -10,7 +10,7 @@ tdengine_ver=$3
 armver=$4
 
 script_dir="$(dirname $(readlink -f $0))"
-top_dir="$(readlink -m ${script_dir}/../..)"
+top_dir="$(readlink -f ${script_dir}/../..)"
 pkg_dir="${top_dir}/debworkroom"
 
 #echo "curr_dir: ${curr_dir}"
diff --git a/packaging/release.sh b/packaging/release.sh
index 70f7af652f..7297eb1d81 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -9,7 +9,7 @@ armver=$1
 
 curr_dir=$(pwd)
 script_dir="$(dirname $(readlink -f $0))"
-top_dir="$(readlink -m ${script_dir}/..)"
+top_dir="$(readlink -f ${script_dir}/..)"
 versioninfo="${top_dir}/src/util/src/version.c"
 
 csudo=""
diff --git a/packaging/rpm/makerpm.sh b/packaging/rpm/makerpm.sh
index aef01875cb..f885c65cdd 100755
--- a/packaging/rpm/makerpm.sh
+++ b/packaging/rpm/makerpm.sh
@@ -12,7 +12,7 @@ tdengine_ver=$3
 armver=$4
 
 script_dir="$(dirname $(readlink -f $0))"
-top_dir="$(readlink -m ${script_dir}/../..)"
+top_dir="$(readlink -f ${script_dir}/../..)"
 pkg_dir="${top_dir}/rpmworkroom"
 spec_file="${script_dir}/tdengine.spec"
 
diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index e1bcce401d..ea3e16d345 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -7,7 +7,7 @@ set -e
 #set -x
 
 # -----------------------Variables definition---------------------
-script_dir=$(dirname $(readlink -m "$0"))
+script_dir=$(dirname $(readlink -f "$0"))
 # Dynamic directory
 data_dir="/var/lib/taos"
 log_dir="/var/log/taos"
diff --git a/packaging/tools/install_client.sh b/packaging/tools/install_client.sh
index 7560ebca41..78d7b75045 100755
--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
@@ -7,7 +7,7 @@ set -e
 #set -x
 
 # -----------------------Variables definition---------------------
-script_dir=$(dirname $(readlink -m "$0"))
+script_dir=$(dirname $(readlink -f "$0"))
 # Dynamic directory
 data_dir="/var/lib/taos"
 log_dir="/var/log/taos"
diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index b461d5c46d..25ab397775 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -9,7 +9,7 @@ set -e
 # -----------------------Variables definition---------------------
 source_dir=$1
 binary_dir=$2
-script_dir=$(dirname $(readlink -m "$0"))
+script_dir=$(dirname $(readlink -f "$0"))
 # Dynamic directory
 data_dir="/var/lib/taos"
 log_dir="/var/log/taos"
diff --git a/packaging/tools/makeclient.sh b/packaging/tools/makeclient.sh
index f8d21e202b..4ff360a1af 100755
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
@@ -11,7 +11,7 @@ build_time=$3
 armver=$4
 
 script_dir="$(dirname $(readlink -f $0))"
-top_dir="$(readlink -m ${script_dir}/../..)"
+top_dir="$(readlink -f ${script_dir}/../..)"
 
 # create compressed install file.
 build_dir="${compile_dir}/build"
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index 714b74dbe6..3d2e624cee 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -9,7 +9,7 @@ build_time=$3
 armver=$4
 
 script_dir="$(dirname $(readlink -f $0))"
-top_dir="$(readlink -m ${script_dir}/../..)"
+top_dir="$(readlink -f ${script_dir}/../..)"
 
 # create compressed install file.
 build_dir="${compile_dir}/build"
diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh
index a62f7a5eeb..eea36f4484 100755
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
@@ -4,7 +4,7 @@
 # is required to use systemd to manage services at boot
 #set -x
 # -----------------------Variables definition---------------------
-script_dir=$(dirname $(readlink -m "$0"))
+script_dir=$(dirname $(readlink -f "$0"))
 # Dynamic directory
 data_dir="/var/lib/taos"
 log_dir="/var/log/taos"
diff --git a/packaging/tools/repair_link.sh b/packaging/tools/repair_link.sh
index 42b1082a9e..7fd503f270 100755
--- a/packaging/tools/repair_link.sh
+++ b/packaging/tools/repair_link.sh
@@ -17,7 +17,7 @@ done
 declare -A dirHash
 
 for linkFile in $(find -L $linkDir -xtype l); do
-    targetFile=$(readlink -m $linkFile)
+    targetFile=$(readlink -f $linkFile)
     echo "targetFile: ${targetFile}"
     # TODO : Extract directory part and basename part
     dirName=$(dirname $(dirname ${targetFile}))
-- 
GitLab