Script: modify common.sh

KangLin · KangLin · commit 4f2e7bab6632 · 2026-04-10T11:54:47.000+08:00
diff --git a/Script/build_android.sh b/Script/build_android.sh
@@ -12,6 +12,7 @@ fi
 
 source $(dirname $(readlink -f $0))/common.sh
 detect_os_info
+check_echo_color_with_tput
 
 # modify follow value
 Qt6_DIR=/opt/Qt/6.6.3/android_x86_64
diff --git a/Script/build_appimage.sh b/Script/build_appimage.sh
@@ -15,6 +15,7 @@ fi
 
 source $(dirname $(readlink -f $0))/common.sh
 detect_os_info
+check_echo_color_with_tput
 
 usage_long() {
     echo "$0 [--install=<install directory>] [ [-h|--help] [-v|--verbose[=0|1]] --source=<source directory>] [--tools=<tools directory>] [--build=<build directory>]"
@@ -41,7 +42,7 @@ if command -V getopt >/dev/null; then
     OPTS=help,verbose::,install:,source:,tools:,build:
     ARGS=`getopt -o h,v:: -l $OPTS -n $(basename $0) -- "$@"`
     if [ $? != 0 ]; then
-        log_fail "exec getopt fail: $?"
+        echo_error "exec getopt fail: $?"
         exit 1
     fi
     #echo "ARGS=[$ARGS]"
diff --git a/Script/build_debpackage.sh b/Script/build_debpackage.sh
@@ -14,6 +14,7 @@ INSTALL_BUILD_DEPEND=0
 
 source $(dirname $(readlink -f $0))/common.sh
 detect_os_info
+check_echo_color_with_tput
 
 usage_long() {
     echo "$0 [-h|--help] [-v|--verbose[=0|1]] [--install=<install directory>] [--rabbitcommon<RabbitCommon directory>"
@@ -38,7 +39,7 @@ if command -V getopt >/dev/null; then
     OPTS=help,verbose::,install:,rabbitcommon::,install-build-depend::
     ARGS=`getopt -o h,v:: -l $OPTS -n $(basename $0) -- "$@"`
     if [ $? != 0 ]; then
-        log_fail "exec getopt fail: $?"
+        echo_error "exec getopt fail: $?"
         exit 1
     fi
     #echo "ARGS=[$ARGS]"
diff --git a/Script/build_depend.sh b/Script/build_depend.sh
@@ -13,6 +13,7 @@ fi
 
 source $(dirname $(readlink -f $0))/common.sh
 detect_os_info
+check_echo_color_with_tput
 
 install_gnu_getopt
 if [ "$DISTRO" = "macOS" ]; then
diff --git a/Script/build_linux.sh b/Script/build_linux.sh
@@ -84,7 +84,7 @@ parse_with_getopt() {
         OPTS=help,verbose::,docker::,deb::,rpm::,appimage::,macos::,docker-image:,docker-platform::,qt:,install:,source:,tools:,build:
         ARGS=`getopt -o h,v:: -l $OPTS -n $(basename $0) -- "$@"`
         if [ $? != 0 ]; then
-            log_fail "exec getopt fail: $?"
+            echo_error "exec getopt fail: $?"
             exit 1
         fi
         #echo "ARGS=[$ARGS]"
@@ -263,7 +263,7 @@ validate_parameters() {
     for var in DEB RPM DOCKER APPIMAGE; do
         local value="${!var}"
         if [ "$value" != "0" ] && [ "$value" != "1" ]; then
-            log_fail "Error: Parameter $var must be 0 or 1" >&2
+            echo_error "Error: Parameter $var must be 0 or 1" >&2
             exit 1
         fi
     done
@@ -274,23 +274,23 @@ validate_parameters() {
             ;;
         ubuntu*|debian*|kali*|*kylin*|*deepin*)
             if [ $RPM -eq 1 ]; then
-              log_fail "Error: Not recommended build rpm package in $DOCKER_IMAGE"
+              echo_error "Error: Not recommended build rpm package in $DOCKER_IMAGE"
               exit 1
             fi
             ;;
         fedora*|rhel*|centos*|almalinux*|rocky*)
             if [ $DEB -eq 1 ]; then
-              log_fail "Error: Not recommended build deb package in $DOCKER_IMAGE"
+              echo_error "Error: Not recommended build deb package in $DOCKER_IMAGE"
               exit 1
             fi
             ;;
         *)
             if [ $RPM -eq 1 ]; then
-              log_fail "Error: Not recommended build rpm package in $DOCKER_IMAGE"
+              echo_error "Error: Not recommended build rpm package in $DOCKER_IMAGE"
               exit 1
             fi
             if [ $DEB -eq 1 ]; then
-              log_fail "Error: Not recommended build deb package in $DOCKER_IMAGE"
+              echo_error "Error: Not recommended build deb package in $DOCKER_IMAGE"
               exit 1
             fi
         ;;
@@ -343,7 +343,7 @@ if [ $DOCKER -eq 1 ]; then
     ARCH=`dpkg --print-architecture`
     echo "The host arch: $ARCH"
     if [ -z "$DOCKER_IMAGE" ]; then
-        log_fail "DOCKER_IMAGE is empty. please set --docker-image"
+        echo_error "DOCKER_IMAGE is empty. please set --docker-image"
         exit 1
     fi
     ## Copy the source code to build directory
diff --git a/Script/build_macos.sh b/Script/build_macos.sh
@@ -11,9 +11,8 @@ if [ -z "$BUILD_VERBOSE" ]; then
 fi
 
 source $(dirname $(readlink -f $0))/common.sh
-
 detect_os_info
-
+check_echo_color_with_tput
 setup_macos
 
 usage_long() {
@@ -41,7 +40,7 @@ if command -V getopt >/dev/null; then
     OPTS=help,verbose::,install:,source:,tools:,build:
     ARGS=`getopt -o h,v:: -l $OPTS -n $(basename $0) -- "$@"`
     if [ $? != 0 ]; then
-        echo "exec getopt fail: $?"
+        echo_error "exec getopt fail: $?"
         exit 1
     fi
     #echo "ARGS=[$ARGS]"
diff --git a/Script/build_rpm_package.sh b/Script/build_rpm_package.sh
@@ -12,6 +12,7 @@ fi
 
 source $(dirname $(readlink -f $0))/common.sh
 detect_os_info
+check_echo_color_with_tput
 
 usage_long() {
     echo "$0 [-h|--help] [-v|--verbose[=0|1]] [--install=<install directory>]"
@@ -28,7 +29,7 @@ usage_long() {
 # [如何使用getopt和getopts命令解析命令行选项和参数](https://zhuanlan.zhihu.com/p/673908518)
 # [【Linux】Shell命令 getopts/getopt用法详解](https://blog.csdn.net/arpospf/article/details/103381621)
 if command -V getopt >/dev/null; then
-    echo "getopt is exits"
+    echo_error "getopt is exits"
     #echo "original parameters=[$@]"
     # -o 或 --options 选项后面是可接受的短选项，如 ab:c:: ，表示可接受的短选项为 -a -b -c ，
     # 其中 -a 选项不接参数，-b 选项后必须接参数，-c 选项的参数为可选的
diff --git a/Script/common.sh b/Script/common.sh
@@ -127,18 +127,21 @@ log_error() {
     echo -e "${RED}[X]${NC} $(date '+%Y-%m-%d %H:%M:%S') - $1" >&2
 }
 log_success() {
+    echo -e "${GREEN}[✓]${NC} $(date '+%Y-%m-%d %H:%M:%S') -  $1"
+}
+echo_success() {
     echo -e "${GREEN}[✓]${NC} $1"
 }
-log_fail() {
+echo_error() {
     echo -e "${RED}[X]${NC} $1" >&2
 }
-echo_success() {
+echo_color_success() {
     echo -e "${GREEN} $1 ${NC}"
 }
-echo_warn() {
+echo_color_warn() {
     echo -e "${YELLOW} $1 ${NC}"
 }
-echo_error() {
+echo_color_error() {
     echo -e "${RED} $1 ${NC}" >&2
 }
 
@@ -149,7 +152,7 @@ validate_directory() {
 
     if [ -n "$dir" ]; then
         if [[ "$dir" =~ ^- ]]; then
-            log_fail "Error: $type directory parameter '$dir' cannot start with '-'"
+            echo_error "Error: $type directory parameter '$dir' cannot start with '-'"
             exit 1
         fi
     fi
@@ -304,7 +307,7 @@ create_debian_folder() {
                     echo "ln -s $control_source $repo_root/debian/control"
                 fi
             else
-                log_fail "Error: $control_source is not exist"
+                echo_error "Error: $control_source is not exist"
             fi
         fi
 
@@ -329,7 +332,7 @@ install_debian_depend() {
 #            grep -v '^$' | \
 #            xargs sudo apt install -y
     else
-        log_fail "Error: $repo_root/debian/control is not exist"
+        echo_error "Error: $repo_root/debian/control is not exist"
     fi
 }
 
@@ -504,7 +507,7 @@ version_compare() {
 # Function to check if git is installed
 check_git() {
     if ! command -v git >/dev/null 2>&1; then
-        echo_error "X Git is not installed" >&2
+        echo_color_error "X Git is not installed" >&2
         echo "  Git is required for this script to work." >&2
         echo "" >&2
         echo "  Please install Git using one of the following commands:" >&2
@@ -537,10 +540,10 @@ check_git() {
         local git_version=$(git --version | cut -d' ' -f3)
 
         if ! version_compare "$git_version" "$min_version"; then
-            echo_warn "!️ Git version $git_version is installed, but version $min_version or higher is recommended" >&2
+            echo_color_warn "!️ Git version $git_version is installed, but version $min_version or higher is recommended" >&2
             # Continue anyway, just a warning
         else
-            echo_success "√ Git $git_version is installed"
+            echo_color_success "√ Git $git_version is installed"
         fi
     fi
 
@@ -550,7 +553,7 @@ check_git() {
 # Option to automatically install git (with user confirmation)
 install_git_if_missing() {
     if ! command -v git >/dev/null 2>&1; then
-        echo_warn "!️ Git is required but not installed." >&2
+        echo_color_warn "!️ Git is required but not installed." >&2
         read -p "Would you like to install Git now? (y/n): " -n 1 -r
         echo
         if [[ $REPLY =~ ^[Yy]$ ]]; then
@@ -567,23 +570,23 @@ install_git_if_missing() {
                 if command -v brew >/dev/null 2>&1; then
                     brew install git
                 else
-                    echo_error "X Homebrew not found. Please install Git manually from https://git-scm.com/download/mac" >&2
+                    echo_color_error "X Homebrew not found. Please install Git manually from https://git-scm.com/download/mac" >&2
                     return 1
                 fi
             else
-                echo_error "X Unsupported OS. Please install Git manually." >&2
+                echo_color_error "X Unsupported OS. Please install Git manually." >&2
                 return 1
             fi
 
             # Verify installation
             if command -v git >/dev/null 2>&1; then
-                echo_success "√ Git installed successfully!"
+                echo_color_success "√ Git installed successfully!"
             else
-                echo_error "X Git installation failed. Please install manually." >&2
+                echo_color_error "X Git installation failed. Please install manually." >&2
                 return 1
             fi
         else
-            echo_error "X Git is required. Exiting." >&2
+            echo_color_error "X Git is required. Exiting." >&2
             return 1
         fi
     fi
@@ -606,17 +609,17 @@ test_sed_pattern() {
 
     # Test with -E flag
     if echo "$test_string" | sed -E "s/${VERSION_PATTERN}/REPLACED/g" | grep -q "REPLACED"; then
-        echo_success "  √ -E flag: Matches"
+        echo_color_success "  √ -E flag: Matches"
     else
-        echo_error "  X -E flag: No match"
+        echo_color_error "  X -E flag: No match"
     fi
 
     # Convert to BRE and test
     BRE_PATTERN=$(sed_safe_pattern "$VERSION_PATTERN")
     if echo "$test_string" | sed "s/${BRE_PATTERN}/REPLACED/g" | grep -q "REPLACED"; then
-        echo_success "  √ BRE: Matches"
+        echo_color_success "  √ BRE: Matches"
     else
-        echo_error "  X BRE: No match"
+        echo_color_error "  X BRE: No match"
     fi
 }
 
@@ -665,7 +668,7 @@ version_parser() {
         return 0
     fi
 
-    log_fail "ERROR: Unable to parse version number '$version'" >&2
+    echo_error "ERROR: Unable to parse version number '$version'" >&2
     return 1
 }
 
@@ -686,7 +689,7 @@ display_version_info() {
   是否包含构建: ${data[7]}
 EOF
     else
-        log_fail "数据不完整"
+        echo_error "数据不完整"
     fi
 }
 
@@ -711,7 +714,7 @@ parse_version_assoc() {
         version_array[build]="${BASH_REMATCH[10]:-}"
         return 0
     else
-        log_fail "ERROR: Unable to parse version number '$version'" >&2
+        echo_error "ERROR: Unable to parse version number '$version'" >&2
         return 1
     fi
 }
@@ -781,7 +784,7 @@ compare_versions() {
 
     # 检查数组元素个数
     if [ ${#parts1[@]} -lt 3 ] || [ ${#parts2[@]} -lt 3 ]; then
-        log_fail "version format error" >&2
+        echo_error "version format error" >&2
         return 3
     fi
 
