From c3ae869c4204ab34ae32556df41e6e3f2b978328 Mon Sep 17 00:00:00 2001 From: Ing Date: Sat, 28 Dec 2024 22:27:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=20grep=20=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/data.yml | 2 +- .github/workflows/issues.yml | 2 +- files/initrd/opt/rr/include/functions.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/data.yml b/.github/workflows/data.yml index 28200a60..12916fba 100644 --- a/.github/workflows/data.yml +++ b/.github/workflows/data.yml @@ -45,7 +45,7 @@ jobs: TAG="" if [ "${PRERELEASE}" = "true" ]; then - TAG="$(curl -skL --connect-timeout 10 "${REPO}/tags" | grep /refs/tags/.*\.zip | sed -E 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)" + TAG="$(curl -skL --connect-timeout 10 "${REPO}/tags" | grep "/refs/tags/.*\.zip" | sed -E 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)" else LATESTURL="$(curl -skL --connect-timeout 10 -w %{url_effective} -o /dev/null "${REPO}/releases/latest")" TAG="${LATESTURL##*/}" diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index a6310dd5..6e32a863 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -182,7 +182,7 @@ jobs: TAG="" if [ "${PRERELEASE}" = "true" ]; then - TAG="$(curl -skL --connect-timeout 10 "${REPO}/tags" | grep /refs/tags/.*\.zip | sed -E 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)" + TAG="$(curl -skL --connect-timeout 10 "${REPO}/tags" | grep "/refs/tags/.*\.zip" | sed -E 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)" else LATESTURL="$(curl -skL --connect-timeout 10 -w %{url_effective} -o /dev/null "${REPO}/releases/latest")" TAG="${LATESTURL##*/}" diff --git a/files/initrd/opt/rr/include/functions.sh b/files/initrd/opt/rr/include/functions.sh index ab1df3bb..2489ceb2 100755 --- a/files/initrd/opt/rr/include/functions.sh +++ b/files/initrd/opt/rr/include/functions.sh @@ -398,7 +398,7 @@ function checkBIOS_VT_d() { # 1 - mode function rebootTo() { local MODES="config recovery junior bios memtest" - if [ -z "${1}" ] || ! echo "${MODES}" | grep -qw "${1}"; then exit 1; fi + if [ -z "${1}" ] || ! echo "${MODES}" | grep -wq "${1}"; then exit 1; fi # echo "Rebooting to ${1} mode" GRUBPATH="$(dirname "$(find "${PART1_PATH}/" -name grub.cfg 2>/dev/null | head -1)")" [ -z "${GRUBPATH}" ] && exit 1