feat: 合并12版本分支的修改,删除无效文件

prebuilds/colovu/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Endial Fang (endial@126.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

prebuilds/colovu/lib/libcommon.sh

@@ -1,108 +0,0 @@
-#!/bin/bash
-# Ver: 1.5 by Endial Fang (endial@126.com)
-#
-# 通用函数库
-
-# 加载依赖项
-. /colovu/lib/liblog.sh          # 日志输出函数库
-
-# 函数列表
-
-# 打印包含包含Logo的欢迎信息
-print_welcome_info() {
-    [[ -n "${APP_NAME:-}" ]] && github_repo="https://github.com/colovu/docker-${APP_NAME}"
-
-    LOG_I "  ____      _ "
-    LOG_I " / ___|___ | | _____   ___   _ "
-    LOG_I "| |   / _ \| |/ _ \ \ / / | | |  Docker : ${BOLD}${APP_NAME:-undefined}${RESET}"
-    LOG_I "| |__| (_) | | (_) \ V /| |_| |  Version: ${BOLD}${APP_VER:-0.0}${RESET}"
-    LOG_I " \____\___/|_|\___/ \_/  \__,_|  PowerBy: ${BOLD}Endial@126.com${RESET}"
-    LOG_D " Project Repo: ${github_repo:-}"
-    LOG_I ""
-}
-
-# 根据需要打印欢迎信息
-print_image_welcome() {
-    if [[ ! "$(id -u)" = "0" ]]; then
-        print_welcome_info
-    fi
-}
-
-# 检测可能导致容器执行后直接退出的命令，如"--help"；如果存在，直接返回 0
-# 参数:
-#   $1 - 待检测的参数表
-print_command_help() {
-    local arg
-    for arg; do
-        case "$arg" in
-            -'?'|-H|-h|--help|-help|-V|-v|--version|-version)
-                exec "$@"
-                exit
-                ;;
-        esac
-    done
-}
-
-# 检测应用相应的配置文件是否存在，如果不存在，则从默认配置文件目录拷贝一份
-# 默认配置文件路径：/etc/${APP_NAME}
-# 目标配置文件路径：/srv/conf/${APP_NAME}
-# 参数：
-#   $1 - 基础路径
-#   $* - 基础路径下的文件及目录列表，以" "分割
-# 例子: 
-#   ensure_config_file_exist /etc/${APP_NAME} conf.d server.conf
-ensure_config_file_exist() {
-    local -r base_path="${1:?paths is missing}"
-    local f=""
-    local dist=""
-
-    shift 1
-    LOG_D "List to check: $@"
-    while [ "$#" -gt 0 ]; do
-        f="${1}"
-        LOG_D " Process \"${f}\""
-        if [ -d "${base_path}/${f}" ]; then
-            dist="$(echo ${base_path}/${f} | sed -e 's/\/etc/\/srv\/conf/g')"
-            [[ ! -d "${dist}" ]] && LOG_D " Create directory: ${dist}" && mkdir -p "${dist}"
-            [[ ! -z $(ls -A "${base_path}/${f}") ]] && ensure_config_file_exist "${base_path}/${f}" $(ls -A "${base_path}/${f}")
-        else
-            dist="$(echo ${base_path}/${f} | sed -e 's/\/etc/\/srv\/conf/g')"
-            [[ ! -e "${dist}" ]] && LOG_D " Copy: ${base_path}/${f} ===> ${dist}" && cp "${base_path}/${f}" "${dist}" && rm -rf "/srv/conf/${APP_NAME}/.app_init_flag"
-        fi
-        shift
-    done
-}
-
-# 根据脚本扩展名及权限，执行相应的初始化脚本
-# 参数:
-#   $1 - 文件列表，支持路径通配符
-# 使用: 
-#   process_init_files [file [file [...]]]
-# 例子: 
-#   process_init_files /src/conf/${APP_NAME}/initdb.d/*
-process_init_files() {
-    echo
-    local f
-    for f; do
-        case "$f" in
-            *.sh)
-                if [ -x "$f" ]; then
-                    LOG_I "$0: running $f"
-                    "$f"
-                else
-                    LOG_I "$0: sourcing $f"
-                    . "$f"
-                fi
-                ;;
-            *)      LOG_W "$0: ignoring $f" ;;
-        esac
-        echo
-    done
-}
-
-# 检测当前脚本是被直接执行的，还是从其他脚本中使用 "source" 调用的
-is_sourced() {
-    [ "${#FUNCNAME[@]}" -ge 2 ] \
-    && [ "${FUNCNAME[0]}" = 'is_sourced' ] \
-    && [ "${FUNCNAME[1]}" = 'source' ]
-}

prebuilds/colovu/lib/libfile.sh

@@ -1,153 +0,0 @@
-#!/bin/bash
-<<<<<<<< HEAD:prebuilds/colovu/lib/libfile.sh
-# Ver: 1.1 by Endial Fang (endial@126.com)
-========
-# Ver: 1.2 by Endial Fang (endial@126.com)
->>>>>>>> 12:prebuilds/opt/colovu/lib/libfile.sh
-#
-# 文件操作函数库
-
-# 加载依赖项
-<<<<<<<< HEAD:prebuilds/colovu/lib/libfile.sh
-. /colovu/lib/liblog.sh          # 日志输出函数库
-========
-source "/opt/colovu/lib/libos.sh"
->>>>>>>> 12:prebuilds/opt/colovu/lib/libfile.sh
-
-# 函数列表
-
-# 检测"*_FILE"文件，并从文件中读取信息作为参数值；环境变量不允许 VAR 与 VAR_FILE 方式并存
-# 变量：
-#   $1 - 需要设置的环境变量名称
-#   $2 - 该变量对应的默认值（Option）
-#   
-# 使用: file_env ENV_VAR [DEFAULT]
-file_env() {
-    local var="$1"
-    local fileVar="${var}_FILE"
-    local def="${2:-}"
-    if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
-        error "Both $var and $fileVar are set (but are exclusive)"
-        exit 1
-    fi
-
-    local val="$def"
-    if [ "${!var:-}" ]; then
-        val="${!var}"
-    elif [ "${!fileVar:-}" ]; then
-        val="$(< "${!fileVar}")"
-    fi
-
-    export "$var"="$val"
-    unset "$fileVar"
-}
-
-# 使用规则表达式在文件中替换数据
-# 参数:
-#   $1 - 文件名
-#   $2 - 正则表达式
-#   $3 - 替代数据表达式
-#   $4 - 是否使用POSIX表达式. Default: true
-replace_in_file() {
-    local filename="${1:?filename is required}"
-    local match_regex="${2:?match regex is required}"
-    local substitute_regex="${3:?substitute regex is required}"
-    local posix_regex=${4:-true}
-
-    local result
-
-    # 规避使用'sed in-place' 方式操作
-    # 1) 部分系统兼容性问题，如从ConfigMap中加载的文件
-    # 2) 部分系统不支持"in-place" 方式操作
-    local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues
-    if [[ $posix_regex = true ]]; then
-        result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")"
-    else
-        result="$(sed "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")"
-    fi
-    echo "$result" > "$filename"
-}
-
-# Replace a regex-matching multiline string in a file
-# 使用规则表达式在文件中替换多行数据
-# 参数:
-#   $1 - 文件名
-#   $2 - 正则表达式
-#   $3 - 替代数据表达式
-replace_in_file_multiline() {
-    local filename="${1:?filename is required}"
-    local match_regex="${2:?match regex is required}"
-    local substitute_regex="${3:?substitute regex is required}"
-
-    local result
-    local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues
-    result="$(perl -pe "BEGIN{undef $/;} s${del}${match_regex}${del}${substitute_regex}${del}sg" "$filename")"
-    echo "$result" > "$filename"
-}
-
-# 使用规则表达式在文件中删除数据
-# 参数:
-#   $1 - 文件名
-#   $2 - 正则表达式
-#   $3 - 是否使用POSIX表达式. Default: true
-remove_in_file() {
-    local filename="${1:?filename is required}"
-    local match_regex="${2:?match regex is required}"
-    local posix_regex=${3:-true}
-    local result
-
-    # 规避使用'sed in-place' 方式操作
-    # 1) 部分系统兼容性问题，如从ConfigMap中加载的文件
-    # 2) 部分系统不支持"in-place" 方式操作
-    if [[ $posix_regex = true ]]; then
-        result="$(sed -E "/$match_regex/d" "$filename")"
-    else
-        result="$(sed "/$match_regex/d" "$filename")"
-    fi
-    echo "$result" > "$filename"
-}
-
-# 在符合条件的行后增加文本
-# 参数:
-#   $1 - 文件名
-#   $2 - 正则表达式
-#   $3 - 待增加的文本
-append_in_file() {
-    local file="${1:?missing file}"
-    local match_regex="${2:?missing pattern}"
-    local value="${3:?missing value}"
-
-    # We read the file in reverse, replace the first match (0,/pattern/s) and then reverse the results again
-    result="$(tac "$file" | sed -E "0,/($match_regex)/s||${value}\n\1|" | tac)"
-    echo "$result" > "$file"
-}
-
-# 等待日志文件中包含指定的条目
-# 参数:
-#   $1 - 待查找的条目
-#   $2 - 日志文件
-#   $3 - 最大重试次数. Default: 12
-#   $4 - 重试间隔时间（秒）. Default: 5
-wait_for_log_entry() {
-    local -r entry="${1:-missing entry}"
-    local -r log_file="${2:-missing log file}"
-    local -r retries="${3:-12}"
-    local -r interval_time="${4:-5}"
-    local attempt=0
-
-    check_log_file_for_entry() {
-        if ! grep -qE "$entry" "$log_file"; then
-            debug "Entry \"${entry}\" still not present in ${log_file} (attempt $((++attempt))/${retries})"
-            return 1
-        fi
-    }
-    debug "Checking that ${log_file} log file contains entry \"${entry}\""
-    if retry_while check_log_file_for_entry "$retries" "$interval_time"; then
-        debug "Found entry \"${entry}\" in ${log_file}"
-        true
-    else
-        error "Could not find entry \"${entry}\" in ${log_file} after ${retries} retries"
-        debug_execute cat "$log_file"
-        return 1
-    fi
-}

prebuilds/colovu/lib/libfs.sh

@@ -1,178 +0,0 @@
-#!/bin/bash
-<<<<<<<< HEAD:prebuilds/colovu/lib/libfs.sh
-# Ver: 1.2 by Endial Fang (endial@126.com)
-========
-# Ver: 1.3 by Endial Fang (endial@126.com)
->>>>>>>> 12:prebuilds/opt/colovu/lib/libfs.sh
-#
-# 文件管理函数库
-
-# 加载依赖项
-<<<<<<<< HEAD:prebuilds/colovu/lib/libfs.sh
-. /colovu/lib/liblog.sh          # 日志输出函数库
-========
-source "/opt/colovu/lib/liblog.sh"
->>>>>>>> 12:prebuilds/opt/colovu/lib/libfs.sh
-
-# 函数列表
-
-# 确保指定的 文件/路径 所属权为指定的 用户/组
-# 参数:
-#   $1 - 文件路径
-#   $2 - 用户
-#   $3 - 用户组
-ensure_owned_by() {
-    local path="${1:?path is missing}"
-    local owner="${2:?owner is missing}"
-    local group="${3:-}"
-
-    if [[ -n $group ]]; then
-        chown "$owner":"$group" "$path"
-    else
-        chown "$owner":"$owner" "$path"
-    fi
-}
-
-# 检测目录是否存在，如果不存在则创建，同时修改为指定的用户
-# 参数:
-#   $1 - 目录路径
-#   $2 - 用户
-#   $3 - 用户组
-ensure_dir_exists() {
-    local dir="${1:?directory is missing}"
-    local owner_user="${2:-}"
-    local owner_group="${3:-}"
-
-    [ -d "${dir}" ] || mkdir -p "${dir}"
-    if [[ -n $owner_user ]]; then
-        ensure_owned_by "$dir" "$owner_user" "$owner_group"
-    fi
-}
-
-# 检测目录是否存在或为空
-# 参数:
-#   $1 - 目录路径
-is_dir_empty() {
-    local dir="${1:?missing directory}"
-
-    # 计算真实路径，避免符号链接问题
-    local -r dir="$(realpath "$path")"
-    if [[ ! -e "$dir" ]] || [[ -z "$(ls -A "$dir")" ]]; then
-        true
-    else
-        false
-    fi
-}
-
-# 检测挂载的路径是否存在或为空
-# 参数:
-#   $1 - 文件或路径
-is_mounted_dir_empty() {
-    local dir="${1:?missing directory}"
-
-    if is_dir_empty "$dir" || find "$dir" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec false {} +; then
-        true
-    else
-        false
-    fi
-}
-
-# 检测指定的路径当前用户是否可写入
-# 参数:
-#   $1 - 文件或路径
-is_writable() {
-    local file="${1:?missing file}"
-    local dir
-    dir="$(dirname "$file")"
-
-    if [[ (-f "$file" && -w "$file") || (! -f "$file" && -d "$dir" && -w "$dir") ]]; then
-        true
-    else
-        false
-    fi
-}
-
-# 生成相对路径
-# 参数:
-#   $1 - 路径
-#   $2 - 基准路径
-relativize() {
-    local -r path="${1:?missing path}"
-    local -r base="${2:?missing base}"
-
-    pushd "$base" >/dev/null || exit
-    realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||'
-    popd >/dev/null || exit
-}
-
-# 循环设置目录中子目录及文件权限
-# 参数:
-#   $1 - paths (as a string).
-# Flags:
-#   -f|--file-mode - 文件权限模式
-#   -d|--dir-mode - 目录权限模式
-#   -u|--user - 用户
-#   -g|--group - 用户组
-configure_permissions_ownership() {
-    local -r paths="${1:?paths is missing}"
-    local dir_mode=""
-    local file_mode=""
-    local user=""
-    local group=""
-
-    # 参数有效性校验
-    shift 1
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -f|--file-mode)
-                shift
-                file_mode="${1:?missing mode for files}"
-                ;;
-            -d|--dir-mode)
-                shift
-                dir_mode="${1:?missing mode for directories}"
-                ;;
-            -u|--user)
-                shift
-                user="${1:?missing user}"
-                ;;
-            -g|--group)
-                shift
-                group="${1:?missing group}"
-                ;;
-            *)
-                error "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    read -r -a filepaths <<< "$paths"
-    for p in "${filepaths[@]}"; do
-        if [[ -e "$p" ]]; then
-            debug "Check $p"
-            find -L "$p" -printf ""
-            if [[ -n ${dir_mode} ]]; then
-                debug "Change permissions to ${dir_mode} of directories in $p"
-                find -L "$p" -type d ! -perm "$dir_mode" -print0 | xargs -r -0 chmod "$dir_mode"
-            fi
-            if [[ -n ${file_mode} ]]; then
-                debug "Change permissions to ${file_mode} of files in $p"
-                find -L "$p" -type f ! -perm "$file_mode" -print0 | xargs -r -0 chmod "$file_mode"
-            fi
-            if [[ -n $user ]] && [[ -n ${group} ]]; then
-                debug "Change ownership to ${user}:${group} of files and directories in $p"
-                find -L "$p" -print0 | xargs -r -0 chown "${user}:${group}"
-            elif [[ -n $user ]] && [[ -z $group ]]; then
-                debug "Change user to ${user} of files and directories in $p"
-                find -L "$p" -print0 | xargs -r -0 chown "${user}"
-            elif [[ -z $user ]] && [[ -n $group ]]; then
-                debug "Change group to ${group} of files and directories in $p"
-                find -L "$p" -print0 | xargs -r -0 chgrp "${group}"
-            fi
-        else
-            error "$p does not exist"
-        fi
-    done
-}

prebuilds/colovu/lib/liblog.sh

@@ -1,83 +0,0 @@
-#!/bin/bash
-# Ver: 1.1 by Endial Fang (endial@126.com)
-# 
-# 日志输出函数库
-
-#[[ ${ENV_DEBUG:-false} = true ]] && set -x
-MODULE="$(basename "$0")"
-
-RESET='\033[0m'
-BOLD='\033[1m'
-
-# 前景色
-BLACK='\033[38;5;0m'
-RED='\033[38;5;1m'
-GREEN='\033[38;5;2m'
-YELLOW='\033[38;5;3m'
-BLUE='\033[38;5;4m'
-MAGENTA='\033[38;5;5m'
-CYAN='\033[38;5;6m'
-WHITE='\033[38;5;7m'
-
-# 背景色
-ON_BLACK='\033[48;5;0m'
-ON_RED='\033[48;5;1m'
-ON_GREEN='\033[48;5;2m'
-ON_YELLOW='\033[48;5;3m'
-ON_BLUE='\033[48;5;4m'
-ON_MAGENTA='\033[48;5;5m'
-ON_CYAN='\033[48;5;6m'
-ON_WHITE='\033[48;5;7m'
-
-# 函数列表
-
-# 打印输出到 STDERR 设备
-stderr_print() {
-    printf "%b\\n" "${*}" >&2
-}
-
-# 输出实际日志信息
-# 参数:
-#   $1 - 日志信息
-LOG() {
-    local -r bool="${ENV_DEBUG:-false}"
-    shopt -s nocasematch
-    if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then
-        debugInfo="${CYAN}${APP_NAME:-}:${MODULE:-}"
-    else
-        debugInfo="${CYAN}${APP_NAME:-}"
-    fi  
-    stderr_print "${debugInfo} ${MAGENTA}$(date "+%F %T.%3N")${RESET} ${*}"
-}
-
-# 输出调试类日志信息，尽量少使用
-# 参数:
-#   $1 - 日志信息
-LOG_D() {
-    local -r bool="${ENV_DEBUG:-false}"
-    shopt -s nocasematch
-    if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then
-        LOG "${BLUE}DBG${RESET}: ${*}"
-    fi   
-}
-
-# 输出提示信息类日志信息
-# 参数:
-#   $1 - 日志信息
-LOG_I() {
-    LOG "${GREEN}INF${RESET}: ${*}"
-}
-
-# 输出警告类日志信息至sterr
-# 参数:
-#   $1 - 日志信息
-LOG_W() {
-    LOG "${YELLOW}WRN${RESET}: ${*}"
-}
-
-# 输出错误类日志信息至sterr，并退出脚本
-# 参数:
-#   $1 - 日志信息
-LOG_E() {
-    LOG "${RED}ERR${RESET}: ${*}"
-}

prebuilds/colovu/lib/libnet.sh

@@ -1,163 +0,0 @@
-#!/bin/bash
-<<<<<<<< HEAD:prebuilds/colovu/lib/libnet.sh
-# Ver: 1.2 by Endial Fang (endial@126.com)
-========
-# Ver: 1.3 by Endial Fang (endial@126.com)
->>>>>>>> 12:prebuilds/opt/colovu/lib/libnet.sh
-#
-# 文件管理函数库
-
-# 加载依赖项
-<<<<<<<< HEAD:prebuilds/colovu/lib/libnet.sh
-. /colovu/lib/liblog.sh          # 日志输出函数库
-========
-source "/opt/colovu/lib/liblog.sh"
-source "/opt/colovu/lib/libos.sh"
-source "/opt/colovu/lib/libvalidations.sh"
->>>>>>>> 12:prebuilds/opt/colovu/lib/libnet.sh
-
-# 函数列表
-
-# 域名解析
-# 参数:
-#   $1 - 需要解析的主机名
-#   $2 - IP 地址版本 v4/v6, 为空时解析所有版本
-# 返回值:
-#   IP地址
-dns_lookup() {
-    local host="${1:?host is missing}"
-    local ip_version="${2:-}"
-
-    getent "ahosts${ip_version}" "$host" | awk '/STREAM/ {print $1 }' | head -n 1
-}
-
-# 尝试解析域名并返回对应的 IP
-# 参数:
-#   $1 - 主机名
-#   $2 - 尝试次数
-#   $3 - 重试间隔时间（秒）
-# 返回值:
-#   IP地址
-wait_for_dns_lookup() {
-    local hostname="${1:?hostname is missing}"
-    local retries="${2:-5}"
-    local seconds="${3:-1}"
-
-    check_host() {
-        if [[ $(dns_lookup "$hostname") == "" ]]; then
-            false
-        else
-            true
-        fi
-    }
-    # Wait for the host to be ready
-    retry_while "check_host ${hostname}" "$retries" "$seconds"
-    dns_lookup "$hostname"
-}
-
-# 获取当前主机 IP
-# 返回值:
-#   IP地址
-get_machine_ip() {
-    local -a ip_addresses
-    local hostname
-    hostname="$(hostname)"
-    read -r -a ip_addresses <<< "$(dns_lookup "$hostname" | xargs echo)"
-    if [[ "${#ip_addresses[@]}" -gt 1 ]]; then
-        warn "Found more than one IP address associated to hostname ${hostname}: ${ip_addresses[*]}, will use ${ip_addresses[0]}"
-    elif [[ "${#ip_addresses[@]}" -lt 1 ]]; then
-        error "Could not find any IP address associated to hostname ${hostname}"
-        exit 1
-    fi
-    # Check if the first IP address is IPv6 to add brackets
-    if validate_ipv6 "${ip_addresses[0]}" ; then
-        echo "[${ip_addresses[0]}]"
-    else
-        echo "${ip_addresses[0]}"
-    fi
-}
-
-# 检测指定的主机名是否可解析
-# 参数:
-#   $1 - 待检测的主机名
-# 返回值:
-#   true / false
-is_hostname_resolved() {
-    local -r host="${1:?missing value}"
-
-    if [[ -n "$(dns_lookup "$host")" ]]; then
-        true
-    else
-        false
-    fi
-}
-
-# 解析 URL
-# 参数:
-#   $1 - URI 字符串  
-#   $2 - 类型字符串. 有效值 (scheme, authority, userinfo, host, port, path, query or fragment)
-# 返回值:
-#   字符串
-parse_uri() {
-    local uri="${1:?uri is missing}"
-    local component="${2:?component is missing}"
-
-    # Solution based on https://tools.ietf.org/html/rfc3986#appendix-B with
-    # additional sub-expressions to split authority into userinfo, host and port
-    # Credits to Patryk Obara (see https://stackoverflow.com/a/45977232/6694969)
-    local -r URI_REGEX='^(([^:/?#]+):)?(//((([^@/?#]+)@)?([^:/?#]+)(:([0-9]+))?))?(/([^?#]*))?(\?([^#]*))?(#(.*))?'
-    #                    ||            |  |||            |         | |            | |         |  |        | |
-    #                    |2 scheme     |  ||6 userinfo   7 host    | 9 port       | 11 rpath  |  13 query | 15 fragment
-    #                    1 scheme:     |  |5 userinfo@             8 :...         10 path     12 ?...     14 #...
-    #                                  |  4 authority
-    #                                  3 //...
-    local index=0
-    case "$component" in
-        scheme)
-            index=2
-            ;;
-        authority)
-            index=4
-            ;;
-        userinfo)
-            index=6
-            ;;
-        host)
-            index=7
-            ;;
-        port)
-            index=9
-            ;;
-        path)
-            index=10
-            ;;
-        query)
-            index=13
-            ;;
-        fragment)
-            index=14
-            ;;
-        *)
-            stderr_print "unrecognized component $component"
-            return 1
-            ;;
-    esac
-    [[ "$uri" =~ $URI_REGEX ]] && echo "${BASH_REMATCH[${index}]}"
-}
-
-# Wait for a HTTP connection to succeed
-# 等待 HTTP 连接成功
-# 参数:
-#   $1 - URL 地址
-#   $2 - 最大重试次数 (可选)    
-#   $3 - 重试间隔时间 (可选)
-wait_for_http_connection() {
-    local url="${1:?missing url}"
-    local retries="${2:-}"
-    local sleep_time="${3:-}"
-
-    if ! retry_while "debug_execute curl --silent ${url}" "$retries" "$sleep_time"; then
-        error "Could not connect to ${url}"
-        return 1
-    fi
-}

prebuilds/colovu/lib/libos.sh

@@ -1,302 +0,0 @@
-#!/bin/bash
-# Ver: 1.3 by Endial Fang (endial@126.com)
-#
-# 操作系统控制函数库
-
-# 加载依赖项
-. /colovu/lib/libfs.sh           # 文件系统函数库
-
-# 函数列表
-
-# 检测指定用户账户是否存在
-# 参数:
-#   $1 - 用户账户
-# 返回值:
-#   0 / 1
-is_user_exists() {
-    local user="${1:?user is missing}"
-    id "$user" >/dev/null 2>&1
-}
-
-# 检测指定用户分组是否存在
-# 参数:
-#   $1 - 用户组
-# 返回值:
-#   0 / 1
-is_group_exists() {
-    local group="${1:?group is missing}"
-    getent group "$group" >/dev/null 2>&1
-}
-
-# 检测当前是否为 root 用户
-# 返回值:
-#   true / false
-is_root() {
-    if [[ "$(id -u)" = "0" ]]; then
-        LOG_D "Run as root."
-        true
-    else
-        LOG_D "Run as non-root: $(id -u)"
-        false
-    fi
-}
-
-# 确保指定用户组在系统中存在
-# 参数:
-#   $1 - 用户组
-# 标志位:
-#   -s|--system - 创建系统用户 (uid <= 999)
-ensure_group_exists() {
-    local group="${1:?group is missing}"
-    local is_system_user=false
-
-    # 检测标志位
-    shift 1
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -s|--system)
-                is_system_user=true
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    if ! is_group_exists "$group"; then
-        local -a args=("$group")
-        $is_system_user && args+=("--system")
-        groupadd "${args[@]}" >/dev/null 2>&1
-    fi
-}
-
-# 确保指定用户在系统中存在
-# 参数:
-#   $1 - 用户
-# 标志位:
-#   -g|--group - 用户组
-#   -h|--home - 用户家目录
-#   -s|--system - 创建系统用户 (uid <= 999)
-ensure_user_exists() {
-    local user="${1:?user is missing}"
-    local group=""
-    local home=""
-    local is_system_user=false
-
-    # Validate arguments
-    shift 1
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -g|--group)
-                shift
-                group="${1:?missing group}"
-                ;;
-            -h|--home)
-                shift
-                home="${1:?missing home directory}"
-                ;;
-            -s|--system)
-                is_system_user=true
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    if ! is_user_exists "$user"; then
-        local -a user_args=("-N" "$user")
-        $is_system_user && user_args+=("--system")
-        useradd "${user_args[@]}" >/dev/null 2>&1
-    fi
-
-    if [[ -n "$group" ]]; then
-        local -a group_args=("$group")
-        $is_system_user && group_args+=("--system")
-        ensure_group_exists "${group_args[@]}"
-        usermod -g "$group" "$user" >/dev/null 2>&1
-    fi
-
-    if [[ -n "$home" ]]; then
-        mkdir -p "$home"
-        usermod -d "$home" "$user" >/dev/null 2>&1
-        configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group"
-    fi
-}
-
-# 获取系统可用内存大小(MB)信息
-# 返回值:
-#   内存大小(兆字节)
-get_total_memory() {
-    echo $(($(grep MemTotal /proc/meminfo | awk '{print $2}') / 1024))
-}
-
-# 获取以内存定量方式描述的机器类型
-# 标志位:
-#   --memory - 内存大小 (MB，可选)
-# 返回值:
-#   类型名称
-get_machine_size() {
-    local memory=""
-
-    # 检测标志位
-    while [[ "$#" -gt 0 ]]; do
-        case "$1" in
-            --memory)
-                shift
-                memory="${1:?missing memory}"
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    if [[ -z "$memory" ]]; then
-        debug "Memory was not specified, detecting available memory automatically"
-        memory="$(get_total_memory)"
-    fi
-    sanitized_memory=$(convert_to_mb "$memory")
-    if [[ "$sanitized_memory" -gt 26000 ]]; then
-        echo 2xlarge
-    elif [[ "$sanitized_memory" -gt 13000 ]]; then
-        echo xlarge
-    elif [[ "$sanitized_memory" -gt 6000 ]]; then
-        echo large
-    elif [[ "$sanitized_memory" -gt 3000 ]]; then
-        echo medium
-    elif [[ "$sanitized_memory" -gt 1500 ]]; then
-        echo small
-    else
-        echo micro
-    fi
-}
-
-# 获取已定义的所有内存大小描述
-# 返回值:
-#   描述值列表
-get_supported_machine_sizes() {
-    echo micro small medium large xlarge 2xlarge
-}
-
-# 将以字符串表示的内存大小转换为以MB为单位的内存大小值 (i.e. 2G -> 2048)
-# 参数:
-#   $1 - 内存大小
-# 返回值:
-#   转换后的数值
-convert_to_mb() {
-    local amount="${1:-}"
-    if [[ $amount =~ ^([0-9]+)(M|G) ]]; then
-        size="${BASH_REMATCH[1]}"
-        unit="${BASH_REMATCH[2]}"
-        if [[ "$unit" = "G" ]]; then
-            amount="$((size * 1024))"
-        else
-            amount="$size"
-        fi
-    fi
-    echo "$amount"
-}
-
-# 如果禁用调试模式，将输出信息重定向至 /dev/null
-# 参数:
-#   $@ - 待执行的命令
-debug_execute() {
-    local bool="${ENV_DEBUG:-false}"
-    shopt -s nocasematch
-    if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then
-        "$@"
-    else
-        "$@" >/dev/null 2>&1
-    fi   
-}
-
-# 重试执行命令
-# 参数:
-#   $1 - 命令 (字符串)
-#   $2 - 最大尝试次数. 默认值: 12
-#   $3 - 重试前等待时间(秒). 默认值: 5
-# 返回值:
-#   0 / 1
-retry_while() {
-    local -r cmd="${1:?cmd is missing}"
-    local -r retries="${2:-12}"
-    local -r sleep_time="${3:-5}"
-    local return_value=1
-
-    read -r -a command <<< "$cmd"
-    for ((i = 1 ; i <= retries ; i+=1 )); do
-        "${command[@]}" && return_value=0 && break
-        sleep "$sleep_time"
-    done
-    return $return_value
-}
-
-# 生成随机字符串
-# 标志位:
-#   -t|--type - 字符串类型 (ascii, alphanumeric, numeric). 默认值: ascii
-#   -c|--count - 字符串长度. 默认值: 32
-# 返回值:
-#   字符串
-generate_random_string() {
-    local type="ascii"
-    local count="32"
-    local filter
-    local result
-
-    # 检测标志位
-    while [[ "$#" -gt 0 ]]; do
-        case "$1" in
-            -t|--type)
-                shift
-                type="$1"
-                ;;
-            -c|--count)
-                shift
-                count="$1"
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    # 检测类型
-    case "$type" in
-        ascii)
-            filter="[:print:]"
-            ;;
-        alphanumeric)
-            filter="a-zA-Z0-9"
-            ;;
-        numeric)
-            filter="0-9"
-            ;;
-        *)
-        echo "Invalid type ${type}" >&2
-        return 1
-    esac
-    # Obtain count + 10 lines from /dev/urandom to ensure that the resulting string has the expected size
-    # Note there is a very small chance of strings starting with EOL character
-    # Therefore, the higher amount of lines read, this will happen less frequently
-    result="$(head -n "$((count + 10))" /dev/urandom | tr -dc "$filter" | head -c "$count")"
-    echo "$result"
-}
-
-# 为指定字符串生成 MD5 值
-# 参数:
-#   $1 - 字符串
-# 返回值:
-#   字符串对应的 MD5
-generate_md5_hash() {
-  local -r str="${1:?missing input string}"
-  echo -n "$str" | md5sum | awk '{print $1}'
-}

prebuilds/colovu/lib/libservice.sh

@@ -1,212 +0,0 @@
-#!/bin/bash
-# Ver: 1.1 by Endial Fang (endial@126.com)
-#
-# 服务管理函数库
-
-# shellcheck disable=SC1091
-
-# 加载依赖项
-. /colovu/lib/libvalidations.sh    # 数据有效性检测函数库
-
-# 函数列表
-
-# 获取并返回服务 PID
-# 参数:
-#   $1 - PID 文件
-# 返回值:
-#   PID
-get_pid_from_file() {
-    local pid_file="${1:?pid file is missing}"
-
-    if [[ -f "$pid_file" ]]; then
-        if [[ -n "$(< "$pid_file")" ]] && [[ "$(< "$pid_file")" -gt 0 ]]; then
-            echo "$(< "$pid_file")"
-        fi
-    fi
-}
-
-# 检测 PID 对应的服务是否在运行中 
-# 参数:
-#   $1 - PID
-# 返回值:
-#   0 / 1
-is_service_running() {
-    local pid="${1:?pid is missing}"
-
-    kill -0 "$pid" 2>/dev/null
-}
-
-# 通过发送信号停止一个指定 PID 的服务
-# 参数:
-#   $1 - PID 文件
-#   $2 - 信号 (可选)
-stop_service_using_pid() {
-    local pid_file="${1:?pid file is missing}"
-    local signal="${2:-}"
-    local pid
-
-    pid="$(get_pid_from_file "$pid_file")"
-    [[ -z "$pid" ]] || ! is_service_running "$pid" && return
-
-    if [[ -n "$signal" ]]; then
-        kill "-${signal}" "$pid"
-    else
-        kill "$pid"
-    fi
-
-    local counter=10
-    while [[ "$counter" -ne 0 ]] && is_service_running "$pid"; do
-        sleep 1
-        counter=$((counter - 1))
-    done
-}
-
-# 启动一个 cron 守护进程
-# 返回值:
-#   true / false
-cron_start() {
-    if [[ -x "/usr/sbin/cron" ]]; then
-        /usr/sbin/cron
-    elif [[ -x "/usr/sbin/crond" ]]; then
-        /usr/sbin/crond
-    else
-        false
-    fi
-}
-
-# 为指定的服务生成 cron 配置文件
-# 参数:
-#   $1 - 服务名称
-#   $2 - 命令
-# 标志位:
-#   --run-as - 运行的用户. 默认值: root
-#   --schedule - Cron 周期配置. 默认值: * * * * *
-generate_cron_conf() {
-    local service_name="${1:?service name is missing}"
-    local cmd="${2:?command is missing}"
-    local run_as="root"
-    local schedule="* * * * *"
-    local clean="true"
-
-    local clean="true"
-
-    # 检测标志位
-    shift 2
-    while [[ "$#" -gt 0 ]]; do
-        case "$1" in
-            --run-as)
-                shift
-                run_as="$1"
-                ;;
-            --schedule)
-                shift
-                schedule="$1"
-                ;;
-            --no-clean)
-                clean="false"
-                ;;
-            *)
-                echo "Invalid command line flag ${1}" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    mkdir -p /etc/cron.d
-    if "$clean"; then
-        echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name"
-    else
-        echo "${schedule} ${run_as} ${cmd}" >> /etc/cron.d/"$service_name"
-    fi
-}
-
-# 为指定的服务生成 monit 配置文件
-# 参数:
-#   $1 - 服务名
-#   $2 - PID 文件
-#   $3 - 启动命令
-#   $4 - 停止命令
-# 标志位:
-#   --disabled - 是否禁用. 默认值: no
-generate_monit_conf() {
-    local service_name="${1:?service name is missing}"
-    local pid_file="${2:?pid file is missing}"
-    local start_command="${3:?start command is missing}"
-    local stop_command="${4:?stop command is missing}"
-    local monit_conf_dir="/etc/monit/conf.d"
-    local disabled="no"
-
-    # 检测标志位
-    shift 4
-    while [[ "$#" -gt 0 ]]; do
-        case "$1" in
-            --disabled)
-                shift
-                disabled="$1"
-                ;;
-            *)
-                echo "Invalid command line flag ${1}" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    is_boolean_yes "$disabled" && conf_suffix=".disabled"
-    mkdir -p "$monit_conf_dir"
-    cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
-check process ${service_name}
-  with pidfile "${pid_file}"
-  start program = "${start_command}" with timeout 90 seconds
-  stop program = "${stop_command}" with timeout 90 seconds
-EOF
-}
-
-# 为指定的服务生成 Logrotate 配置文件
-# 参数:
-#   $1 - 应用名称
-#   $2 - 日志路径
-# 标志位:
-#   --period - 周期
-#   --rotations - Rotations 存储的数量
-#   --extra - 扩展参数 (可选)
-generate_logrotate_conf() {
-    local service_name="${1:?service name is missing}"
-    local log_path="${2:?log path is missing}"
-    local period="weekly"
-    local rotations="150"
-    local extra=""
-    local logrotate_conf_dir="/etc/logrotate.d"
-    local var_name
-    
-    # 检测标志位
-    shift 2
-    while [[ "$#" -gt 0 ]]; do
-        case "$1" in
-            --period|--rotations|--extra)
-                var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
-                shift
-                declare "$var_name"="${1:?"$var_name" is missing}"
-                ;;
-            *)
-                echo "Invalid command line flag ${1}" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    mkdir -p "$logrotate_conf_dir"
-    cat <<EOF | sed '/^\s*$/d' >"${logrotate_conf_dir}/${service_name}"
-${log_path} {
-  ${period}
-  rotate ${rotations}
-  dateext
-  compress
-  copytruncate
-  missingok
-$(indent "$extra" 2)
-}
-EOF
-}

prebuilds/colovu/lib/libvalidations.sh

@@ -1,293 +0,0 @@
-#!/bin/bash
-<<<<<<<< HEAD:prebuilds/colovu/lib/libvalidations.sh
-# Ver: 1.1 by Endial Fang (endial@126.com)
-========
-# Ver: 1.2 by Endial Fang (endial@126.com)
->>>>>>>> 12:prebuilds/opt/colovu/lib/libvalidations.sh
-#
-# 数据有效性校验函数库
-
-# 加载依赖项
-<<<<<<<< HEAD:prebuilds/colovu/lib/libvalidations.sh
-. /colovu/lib/liblog.sh          # 日志输出函数库
-========
-source "/opt/colovu/lib/liblog.sh"
->>>>>>>> 12:prebuilds/opt/colovu/lib/libvalidations.sh
-
-# 函数列表
-
-# 检测数据是否为整数
-# 参数:
-#   $1 - 待检测的数据
-# 返回值:
-#   true / false
-is_int() {
-    local -r int="${1:?missing value}"
-    
-    if [[ "$int" =~ ^-?[0-9]+ ]]; then
-        true
-    else
-        false
-    fi
-}
-
-# 检测数据是否为正整数
-# 参数:
-#   $1 - 待检测的数据
-# 返回值:
-#   true / false
-is_positive_int() {
-    local -r int="${1:?missing value}"
-    
-    if is_int "$int" && (( "${int}" >= 0 )); then
-        true
-    else
-        false
-    fi
-}
-
-# 检测数据是否为布尔值 '1' 或字符串 'yes/true'
-# 参数:
-#   $1 - 待检测的数据
-# 返回值:
-#   true / false
-is_boolean_yes() {
-    local -r bool="${1:-}"
-
-    # 忽略字母大小写
-    shopt -s nocasematch
-    if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then
-        true
-    else
-        false
-    fi
-}
-
-# 检测数据是否为字符串 'yes/no'
-# 参数:
-#   $1 - 待检测的数据
-# 返回值:
-#   true / false
-is_yes_no_value() {
-    local -r bool="${1:-}"
-
-    if [[ "$bool" =~ ^(yes|no)$ ]]; then
-        true
-    else
-        false
-    fi
-}
-
-# 检测数据是否为字符串 'true/false'
-# 参数:
-#   $1 - 待检测的数据
-# 返回值:
-#   true / false
-is_true_false_value() {
-    local -r bool="${1:-}"
-    if [[ "$bool" =~ ^(true|false)$ ]]; then
-        true
-    else
-        false
-    fi
-}
-
-# 检测数据是否为布尔值 'true/false'
-# 参数:
-#   $1 - 待检测的数据
-is_true_false_value() {
-    local -r bool="${1:-}"
-
-    if [[ "$bool" =~ ^(true|false)$ ]]; then
-        true
-    else
-        false
-    fi
-}
-
-# 检测提供的参数是否为布尔值 1/0
-# 参数:
-#   $1 - 待检测的数据
-is_1_0_value() {
-    local -r bool="${1:-}"
-    
-    if [[ "$bool" =~ ^[10]$ ]]; then
-        true
-    else
-        false
-    fi
-}
-
-# 检测提供的参数是否为空字符串或未定义
-# 参数:
-#   $1 - 待检测的数据
-# 返回值:
-#   true / false
-is_empty_value() {
-    local -r val="${1:-}"
-
-    if [[ -z "$val" ]]; then
-        true
-    else
-        false
-    fi
-}
-
-# 检测数据是否为有效的端口号
-# 标志位:
-#   -unprivileged - 没有特权的端口
-# 参数:
-#   $1 - 待检测的数据
-# 返回值:
-#   true / false 或 错误消息
-validate_port() {
-    local value
-    local unprivileged=0
-
-    # Parse flags
-    while [[ "$#" -gt 0 ]]; do
-        case "$1" in
-            -unprivileged)
-                unprivileged=1
-                ;;
-            --)
-                shift
-                break
-                ;;
-            -*)
-                error "unrecognized flag $1"
-                return 1
-                ;;
-            *)
-                break
-                ;;
-        esac
-        shift
-    done
-
-    if [[ "$#" -gt 1 ]]; then
-        error "too many arguments provided"
-        return 2
-    elif [[ "$#" -eq 0 ]]; then
-        error "missing port argument"
-        return 1
-    else
-        value=$1
-    fi
-
-    if [[ -z "$value" ]]; then
-        error "the value is empty"
-        return 1
-    else
-        if ! is_int "$value"; then
-            warn "value is not an integer"
-            return 2
-        elif [[ "$value" -lt 0 ]]; then
-            warn "negative value provided"
-            return 2
-        elif [[ "$value" -gt 65535 ]]; then
-            warn "requested port is greater than 65535"
-            return 2
-        elif [[ "$unprivileged" = 1 && "$value" -lt 1024 ]]; then
-            warn "privileged port requested"
-            return 3
-        fi
-    fi
-}
-
-# 检测数据是否为有效的IPv6地址
-# 参数:
-#   $1 - 待检测的数据
-validate_ipv6() {
-    local ip="${1:?ip is missing}"
-    local stat=1
-    local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$'
-    local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$'
-
-    if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then
-        stat=0
-    fi
-    return $stat
-}
-
-# 检测数据是否为有效的IPv4地址
-# 参数:
-#   $1 - 待检测的数据
-# 返回值:
-#   0 / 1
-validate_ipv4() {
-    local ip="${1:?ip is missing}"
-    local stat=1
-
-    if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-        read -r -a ip_array <<< "$(tr '.' ' ' <<< "$ip")"
-        [[ ${ip_array[0]} -le 255 && ${ip_array[1]} -le 255 \
-            && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
-        stat=$?
-    fi
-    return $stat
-}
-
-# 检测数据是否为有效的IP地址
-# 参数:
-#   $1 - 待检测的数据
-validate_ip() {
-    local ip="${1:?ip is missing}"
-    local stat=1
-
-    if validate_ipv4 "$ip"; then
-        stat=0
-    else
-        stat=$(validate_ipv6 "$ip")
-    fi
-    return $stat
-}
-
-# 校验字符串格式
-# 标志位:
-#   -min-length - 最小长度
-#   -max-length - 最大长度
-# 参数:
-#   $1 - 待检测的数据
-# 返回值:
-#   0 / 1
-validate_string() {
-    local string
-    local min_length=-1
-    local max_length=-1
-
-    # Parse flags
-    while [ "$#" -gt 0 ]; do
-        case "$1" in
-            -min-length)
-                shift
-                min_length=${1:-}
-                ;;
-            -max-length)
-                shift
-                max_length=${1:-}
-                ;;
-            --)
-                shift
-                break
-                ;;
-            -*)
-                error "unrecognized flag $1"
-                return 1
-                ;;
-            *)
-                string="$1"
-                ;;
-        esac
-        shift
-    done
-
-    if [[ "$min_length" -ge 0 ]] && [[ "${#string}" -lt "$min_length" ]]; then
-        info "string length is less than $min_length"
-        return 1
-    fi
-    if [[ "$max_length" -ge 0 ]] && [[ "${#string}" -gt "$max_length" ]]; then
-        info "string length is great than $max_length"
-        return 1
-    fi
-}

prebuilds/usr/sbin/download_pkg

@@ -3,8 +3,6 @@
 # 
 # shell 执行参数，分别为 -e(命令执行错误则退出脚本) -u(变量未定义则报错) -x(打印实际待执行的命令行)
 set -eux
-<<<<<<< HEAD
-=======
 
 # 定义错误处理函数，添加错误位置信息
 error() {
@@ -13,7 +11,6 @@ error() {
     echo "Error at $error_location: $error_message" >&2
     exit 1
 }
->>>>>>> 12
 
 print_usage() {
   echo "Usage: download_pkg <COMMAND> <PACKAGE-NAME> \"<URLS>\" [OPTIONS]"
@@ -48,18 +45,6 @@ check_pgp() {
     local keys="${3:?missing key id}"
     
     GNUPGHOME="$(mktemp -d)"
-<<<<<<< HEAD
-	if which gpg >/dev/null 2>&1; then
-		for key in $keys; do
-        gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${key}" || 
-        gpg --batch --keyserver pgp.mit.edu --recv-keys "${key}" || 
-        gpg --batch --keyserver keys.gnupg.net --recv-keys "${key}" || 
-        gpg --batch --keyserver keyserver.pgp.com --recv-keys "${key}"; 
-	    done
-	    gpg --batch --verify "$name_asc" "$name"
-	    command -v gpgconf > /dev/null && gpgconf --kill all
-	fi
-=======
     if which gpg >/dev/null 2>&1; then
         local key_servers=("pgp.mit.edu" "keys.gnupg.net" "keyserver.pgp.com" "ha.pool.sks-keyservers.net")
         for key in $keys; do
@@ -72,7 +57,6 @@ check_pgp() {
         gpg --batch --verify "$name_asc" "$name" || error "PGP verification" "PGP verification failed"
         command -v gpgconf > /dev/null && gpgconf --kill all
     fi
->>>>>>> 12
 }
 
 # 获取并解析参数 
@@ -134,32 +118,6 @@ cache_root=/tmp
 package="$2"
 package_urls=$3
 
-<<<<<<< HEAD
-cd $INSTALL_ROOT
-
-echo "Downloading $PACKAGE package"
-for url in $PACKAGE_URLS; do
-  echo "Try $url/$PACKAGE"
-    if wget -O "$CACHE_ROOT/$PACKAGE" "$url/$PACKAGE" && [ -s "$CACHE_ROOT/$PACKAGE" ]; then
-      if [ -n "${PACKAGE_KEYS:-}" ]; then
-        wget -O "$CACHE_ROOT/$PACKAGE.asc" "$url/$PACKAGE.asc" || wget -O "$CACHE_ROOT/$PACKAGE.asc" "$url/$PACKAGE.sign" || :
-        if [ ! -e "$CACHE_ROOT/$PACKAGE.asc" ]; then
-          exit 1
-        fi
-      fi
-      break
-    fi
-done
-
-if [ -n "${PACKAGE_SHA256:-}" ]; then
-	echo "Verifying package integrity"
-	echo "$PACKAGE_SHA256 *$CACHE_ROOT/$PACKAGE" | sha256sum -c -
-fi
-
-if [ -e "$CACHE_ROOT/$PACKAGE.asc" ]; then
-	echo "Verifying package with PGP"
-  check_pgp "$CACHE_ROOT/$PACKAGE.asc" "$CACHE_ROOT/$PACKAGE" "$PACKAGE_KEYS"
-=======
 # 检查缓存目录中是否已存在该软件包
 if [ -e "$cache_root/$package" ]; then
     echo "Package already exists in cache: $cache_root/$package"
@@ -193,7 +151,6 @@ fi
 if [ -e "$cache_root/$package.asc" ]; then
     echo "Verifying package with PGP"
     check_pgp "$cache_root/$package.asc" "$cache_root/$package" "$package_keys"
->>>>>>> 12
 fi
 
 # If the tarball has too many files, it can trigger a bug
@@ -203,28 +160,6 @@ fi
 
 # 安装或解压软件
 case "$1" in
-<<<<<<< HEAD
-	download)
-		echo "Download success: $CACHE_ROOT/$PACKAGE"
-		;;
-	install) 
-		echo "Installing $PACKAGE"
-		cp $CACHE_ROOT/$PACKAGE /usr/local/sbin/
-		;;
-	unpack) 
-		if ! tar -taf $CACHE_ROOT/$PACKAGE >/dev/null 2>&1; then
-			echo "Invalid or corrupt '$PACKAGE' package."
-			exit 1
-		fi
-		echo "Unpacking $PACKAGE to $CACHE_ROOT" 
-    cd $CACHE_ROOT
-		if which bsdtar >/dev/null 2>&1; then
-  		bsdtar -xf $CACHE_ROOT/$PACKAGE
-		else
-      tar --no-same-owner -xaf $CACHE_ROOT/$PACKAGE
-		fi
-		;;
-=======
     download)
         echo "Download success: $cache_root/$package"
         ;;
@@ -245,5 +180,4 @@ case "$1" in
             tar --no-same-owner -xaf $cache_root/$package
         fi
         ;;
->>>>>>> 12
 esac

prebuilds/usr/sbin/install_pkg

@@ -29,14 +29,6 @@ if [ $# -lt 1 ]; then
   exit 1
 fi
 
-<<<<<<< HEAD
-case "$1" in
-  -h|--help)
-    print_usage
-    exit 0
-    ;;
-esac
-=======
 # 解析命令行参数
 UPDATE=true
 while [[ $# -gt 0 ]]; do
@@ -50,38 +42,12 @@ while [[ $# -gt 0 ]]; do
             ;;
     esac
 done
->>>>>>> 12
 
 retry=0
 max=2
 export DEBIAN_FRONTEND=noninteractive && 
 
 until [ $retry -gt $max ]; do
-<<<<<<< HEAD
-  set +e
-  (
-    export DEBIAN_FRONTEND=noninteractive &&
-    apt-get update &&
-    apt-get upgrade -y &&
-    apt-get install -y --no-install-recommends "$@"
-  )
-  CODE=$?
-  set -e
-  if [ $CODE -eq 0 ]; then
-    break
-  fi
-  if [ $retry -eq $max ]; then
-    exit $CODE
-  fi
-  echo "apt failed, retrying"
-  retry=$(($retry + 1))
-done
-
-apt-get purge -y --auto-remove
-apt-get autoclean -y
-
-rm -rf /var/lib/apt/lists /var/cache/apt/archives || :
-=======
     set +e
     (
         apt-get update &&
@@ -103,4 +69,3 @@ done
 apt-get purge -y --auto-remove && apt-get autoclean -y || :
 rm -rf /var/lib/apt/lists /var/cache/apt/archives || :
 echo "Installation completed successfully."
->>>>>>> 12

prebuilds/usr/sbin/select_source

@@ -5,9 +5,6 @@
 # shell 执行参数，分别为 -e(命令执行错误则退出脚本) -u(变量未定义则报错) -x(打印实际待执行的命令行)
 set -eux
 
-<<<<<<< HEAD
-cp /etc/apt/sources/${1:-default}.sources /etc/apt/sources.list.d/debian.sources
-=======
 # 检查是否有足够的权限
 if [ "$EUID" -ne 0 ]; then
     echo "Error: This script must be run as root."
@@ -32,4 +29,3 @@ target_file="/etc/apt/sources.list.d/debian.sources"
 # 复制源文件到目标文件
 cp "$source_file" "$target_file"
 echo "Successfully selected apt source: $source_name"
->>>>>>> 12