From f2e334b682e403f55d20d1a3ff333d2886bb8a60 Mon Sep 17 00:00:00 2001 From: Ing Date: Fri, 8 Nov 2024 23:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20menu.sh=20=E5=92=8C=20func?= =?UTF-8?q?.sh=EF=BC=8C=E4=BC=98=E5=8C=96=20cp=20=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=20-r=20=E9=80=89=E9=A1=B9=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=20-R=20=E4=BB=A5=E6=8F=90=E9=AB=98=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- files/initrd/opt/rr/menu.sh | 10 +++++----- scripts/func.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh index c13357a5..b4b74acb 100755 --- a/files/initrd/opt/rr/menu.sh +++ b/files/initrd/opt/rr/menu.sh @@ -2128,9 +2128,9 @@ function tryRecoveryDSM() { if [ -n "${R_PLATFORM}" ] && arrayExistItem "${R_PLATFORM}" ${PS} && [ -n "${R_PRODUCTVER}" ] && arrayExistItem "${R_PRODUCTVER}" ${VS} && [ -n "${R_BUILDNUM}" ] && [ -n "${R_SMALLNUM}" ]; then - cp -Rf "${TMP_PATH}/mdX/usr/rr/backup/p1/"* "${PART1_PATH}" + cp -rf "${TMP_PATH}/mdX/usr/rr/backup/p1/"* "${PART1_PATH}" if [ -d "${TMP_PATH}/mdX/usr/rr/backup/p3" ]; then - cp -Rf "${TMP_PATH}/mdX/usr/rr/backup/p3/"* "${PART3_PATH}" + cp -rf "${TMP_PATH}/mdX/usr/rr/backup/p3/"* "${PART3_PATH}" fi copyDSMFiles "${TMP_PATH}/mdX/.syno/patch" __umountDSMRootDisk @@ -2439,7 +2439,7 @@ function savemodrr() { xz -dc <"${RR_RAMDISK_FILE}" | cpio -idm ) >/dev/null 2>&1 || true rm -rf "${RDXZ_PATH}/opt/rr" - cp -Rf "$(dirname ${WORK_PATH})" "${RDXZ_PATH}/" + cp -rf "$(dirname ${WORK_PATH})" "${RDXZ_PATH}/" ( cd "${RDXZ_PATH}" RDSIZE=$(du -sb ${RDXZ_PATH} 2>/dev/null | awk '{print $1}') @@ -3297,7 +3297,7 @@ function updateRR() { if [ "${KEY: -1}" = "/" ]; then rm -Rf "${VALUE}"/* mkdir -p "${VALUE}" - cp -Rf "${TMP_PATH}/update/${VALUE}"/* "${VALUE}" + cp -rf "${TMP_PATH}/update/${VALUE}"/* "${VALUE}" if [ "$(realpath "${VALUE}")" = "$(realpath "${MODULES_PATH}")" ]; then if [ -n "${MODEL}" -a -n "${PRODUCTVER}" ]; then KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${WORK_PATH}/platforms.yml")" @@ -3379,7 +3379,7 @@ function updateAddons() { fi rm -Rf "${ADDONS_PATH}/"* - cp -Rf "${TMP_PATH}/update/"* "${ADDONS_PATH}/" + cp -rf "${TMP_PATH}/update/"* "${ADDONS_PATH}/" rm -rf "${TMP_PATH}/update" touch ${PART1_PATH}/.build sync diff --git a/scripts/func.sh b/scripts/func.sh index b4325e9c..e2bb6050 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -248,7 +248,7 @@ function repackInitrd() { cd "${RDXZ_PATH}" sudo xz -dc <"${INITRD_FILE}" | sudo cpio -idm ) || true - sudo cp -Rf "${PLUGIN_PATH}/"* "${RDXZ_PATH}/" + sudo cp -rf "${PLUGIN_PATH}/"* "${RDXZ_PATH}/" [ -f "${OUTPUT_PATH}" ] && rm -rf "${OUTPUT_PATH}" ( cd "${RDXZ_PATH}"