From 59981d40c32d813c4eceeefc185076d6415bceea Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 13 Jun 2022 11:57:49 +0800 Subject: [PATCH] chore(tools): taos tools mac for3.0 (#13752) * chore(release): make get_os.sh works on mac * chore(tools): update taos-tools --- packaging/tools/get_os.sh | 17 +++++++++++------ tools/taos-tools | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packaging/tools/get_os.sh b/packaging/tools/get_os.sh index f74b63f980..777ae448cd 100755 --- a/packaging/tools/get_os.sh +++ b/packaging/tools/get_os.sh @@ -4,11 +4,16 @@ # is required to use systemd to manage services at boot set -e -# set -x +#set -x # -----------------------Variables definition--------------------- -OS=$(cat /etc/*-release | grep "^NAME=" | cut -d= -f2) -len=$(echo ${#OS}) -len=$((len-2)) -retval=$(echo -ne ${OS:1:${len}} | cut -d" " -f1) -echo -ne $retval + +if [[ "$OSTYPE" == "darwin"* ]]; then + echo -e "Darwin" +else + OS=$(cat /etc/*-release | grep "^NAME=" | cut -d= -f2) + len=$(echo ${#OS}) + len=$((len-2)) + retval=$(echo -ne ${OS:1:${len}} | cut -d" " -f1) + echo -ne $retval +fi diff --git a/tools/taos-tools b/tools/taos-tools index 1446be9516..3d5aa76f8c 160000 --- a/tools/taos-tools +++ b/tools/taos-tools @@ -1 +1 @@ -Subproject commit 1446be95164e6cda3ff88270f7cfa50d8430503f +Subproject commit 3d5aa76f8c718dcffa100b45e4cbf313d499c356