为 VMware 环境添加时间同步支持

VERSION

@@ -1 +1 @@
-25.5.6
+25.5.5

files/initrd/opt/rr/include/consts.sh

@@ -8,7 +8,7 @@
 
 # shellcheck disable=SC2034
 
-RR_VERSION="25.5.6"
+RR_VERSION="25.5.5"
 RR_RELEASE=""
 RR_TITLE="RR v${RR_VERSION}"
 

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 -p awk || return 1
-  type cut >/dev/null 2>&1 || return 1
+  type -p cut || return 1
-  type sed >/dev/null 2>&1 || return 1
+  type -p sed || return 1
-  type tar >/dev/null 2>&1 || 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

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"

files/mnt/p1/RR_VERSION

@@ -1 +1 @@
-25.5.6
+25.5.5

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 2>&1 || ! 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
 
@@ -239,12 +239,11 @@ function resize() {
 
   sudo truncate -s ${SIZE}M "${OUTPUT_FILE}"
   echo -e "d\n\nn\n\n\n\n\nn\nw" | sudo fdisk "${OUTPUT_FILE}" >/dev/null 2>&1
-  local LOOPX LOOPXPY
+  local LOOPX
   LOOPX=$(sudo losetup -f)
   sudo losetup -P "${LOOPX}" "${OUTPUT_FILE}"
-  LOOPXPY="$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
+  sudo e2fsck -fp "$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
-  sudo e2fsck -fp "${LOOPXPY:-${LOOPX}p3}"
+  sudo resize2fs "$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
-  sudo resize2fs "${LOOPXPY:-${LOOPX}p3}"
   sudo losetup -d "${LOOPX}"
 }
 

scripts/func.sh

@@ -314,12 +314,11 @@ function resizeImg() {
 
   sudo truncate -s ${SIZE}M "${OUTPUT_FILE}"
   echo -e "d\n\nn\n\n\n\n\nn\nw" | sudo fdisk "${OUTPUT_FILE}" >/dev/null 2>&1
-  local LOOPX LOOPXPY
+  local LOOPX
   LOOPX=$(sudo losetup -f)
   sudo losetup -P "${LOOPX}" "${OUTPUT_FILE}"
-  LOOPXPY="$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
+  sudo e2fsck -fp "$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
-  sudo e2fsck -fp "${LOOPXPY:-${LOOPX}p3}"
+  sudo resize2fs "$(find "${LOOPX}p"* -maxdepth 0 2>/dev/null | sort -n | tail -1)"
-  sudo resize2fs "${LOOPXPY:-${LOOPX}p3}"
   sudo losetup -d "${LOOPX}"
 }
 
@@ -330,7 +329,7 @@ function createvmx() {
   local BLIMAGE=${1}
   local VMNAME=${2}
 
-  if ! type qemu-img >/dev/null 2>&1; then
+  if ! type -p qemu-img; then
     sudo apt install -y qemu-utils
   fi
 

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 2>&1 || ! 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
 #