From 4bfbe81105804f92290136a6165cf1d80b2c2a10 Mon Sep 17 00:00:00 2001 From: Ing Date: Wed, 14 May 2025 21:59:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=BD=E4=BB=A4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=A3=80=E6=9F=A5=EF=BC=8C=E4=BD=BF=E7=94=A8=20type?= =?UTF-8?q?=20-p=20=E6=9B=BF=E4=BB=A3=20type=EF=BC=8C=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E5=8F=AF=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- files/initrd/opt/rr/include/functions.sh | 10 +++++----- files/initrd/opt/rr/include/i18n.sh | 2 +- localbuild.sh | 2 +- scripts/func.sh | 2 +- sourcebuild.sh | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/files/initrd/opt/rr/include/functions.sh b/files/initrd/opt/rr/include/functions.sh index 11d0fd0f..9296ed47 100755 --- a/files/initrd/opt/rr/include/functions.sh +++ b/files/initrd/opt/rr/include/functions.sh @@ -23,10 +23,10 @@ function checkBootLoader() { [ ! -w "${PART1_PATH}" ] && return 1 [ ! -w "${PART2_PATH}" ] && return 1 [ ! -w "${PART3_PATH}" ] && return 1 - type awk >/dev/null 2>&1 || return 1 - type cut >/dev/null 2>&1 || return 1 - type sed >/dev/null 2>&1 || return 1 - type tar >/dev/null 2>&1 || return 1 + type -p awk || return 1 + type -p cut || return 1 + type -p sed || return 1 + type -p tar || return 1 return 0 } @@ -220,7 +220,7 @@ function _set_conf_kv() { # @ - url list function _get_fastest() { local speedlist="" - if type ping >/dev/null 2>&1; then + if type -p ping; then for I in "$@"; do speed=$(LC_ALL=C ping -c 1 -W 5 "${I}" 2>/dev/null | awk -F'[= ]' '/time=/ {for(i=1;i<=NF;i++) if ($i=="time") print $(i+1)}') speedlist+="${I} ${speed:-999}\n" # Assign default value 999 if speed is empty diff --git a/files/initrd/opt/rr/include/i18n.sh b/files/initrd/opt/rr/include/i18n.sh index 45b28973..6abc38c4 100755 --- a/files/initrd/opt/rr/include/i18n.sh +++ b/files/initrd/opt/rr/include/i18n.sh @@ -8,7 +8,7 @@ [ -z "${WORK_PATH}" ] || [ ! -d "${WORK_PATH}/include" ] && WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" >/dev/null 2>&1 && pwd)" -type gettext >/dev/null 2>&1 && alias TEXT='gettext "rr"' || alias TEXT='echo' +type -p gettext && alias TEXT='gettext "rr"' || alias TEXT='echo' shopt -s expand_aliases [ -d "${WORK_PATH}/lang" ] && export TEXTDOMAINDIR="${WORK_PATH}/lang" diff --git a/localbuild.sh b/localbuild.sh index 4ff3a10f..5a8ef271 100755 --- a/localbuild.sh +++ b/localbuild.sh @@ -39,7 +39,7 @@ function create() { sudo apt install -y locales busybox dialog gettext sed gawk jq curl sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils dosfstools cpio xz-utils lz4 lzma bzip2 gzip zstd # sudo snap install yq - if ! type yq &>/dev/null || ! yq --version 2>/dev/null | grep -q "v4."; then + if ! type -p yq || ! yq --version 2>/dev/null | grep -q "v4."; then sudo curl -kL https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -o /usr/bin/yq && sudo chmod a+x /usr/bin/yq fi diff --git a/scripts/func.sh b/scripts/func.sh index 89cac4c4..aab4c3c5 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -329,7 +329,7 @@ function createvmx() { local BLIMAGE=${1} local VMNAME=${2} - if ! type qemu-img &>/dev/null; then + if ! type -p qemu-img; then sudo apt install -y qemu-utils fi diff --git a/sourcebuild.sh b/sourcebuild.sh index be94e8f6..b329e71a 100755 --- a/sourcebuild.sh +++ b/sourcebuild.sh @@ -9,7 +9,7 @@ # sudo apt install -y locales busybox dialog gettext sed gawk jq curl # sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils dosfstools cpio xz-utils lz4 lzma bzip2 gzip zstd # # sudo snap install yq -# if ! type yq &>/dev/null || ! yq --version 2>/dev/null | grep -q "v4."; then +# if ! type -p yq || ! yq --version 2>/dev/null | grep -q "v4."; then # sudo curl -kL https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -o /usr/bin/yq && sudo chmod a+x /usr/bin/yq # fi #