yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix make null error

Browse Source
This commit is contained in:
Ing 2024-04-28 10:32:04 +08:00
parent 16930fd99f
commit 46598132fd
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
files/initrd/opt/rr/menu.sh
View File

@ -1102,6 +1102,7 @@ function getSynoExtractor() {
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
rm -f "${OLDPAT_PATH}" rm -f "${OLDPAT_PATH}"
rm -rf "${RAMDISK_PATH}" rm -rf "${RAMDISK_PATH}"
echo -e "$(TEXT "pat Invalid, try again!")" >"${LOG_FILE}"
return 1 return 1
fi fi
rm -f "${OLDPAT_PATH}" rm -f "${OLDPAT_PATH}"
@ -1151,6 +1152,7 @@ function extractPatFiles() {
mkdir -p "${EXT_PATH}" mkdir -p "${EXT_PATH}"
echo -n "$(printf "$(TEXT "Disassembling %s: ")" "$(basename "${PAT_PATH}")")" echo -n "$(printf "$(TEXT "Disassembling %s: ")" "$(basename "${PAT_PATH}")")"
RET=0
if [ "${isencrypted}" = "yes" ]; then if [ "${isencrypted}" = "yes" ]; then
EXTRACTOR_PATH="${PART3_PATH}/extractor" EXTRACTOR_PATH="${PART3_PATH}/extractor"
EXTRACTOR_BIN="syno_extract_system_patch" EXTRACTOR_BIN="syno_extract_system_patch"
@ -1164,22 +1166,19 @@ function extractPatFiles() {
# Uses the extractor to untar pat file # Uses the extractor to untar pat file
echo "$(TEXT "Extracting ...")" echo "$(TEXT "Extracting ...")"
LD_LIBRARY_PATH=${EXTRACTOR_PATH} "${EXTRACTOR_PATH}/${EXTRACTOR_BIN}" "${PAT_PATH}" "${EXT_PATH}" >"${LOG_FILE}" 2>&1 LD_LIBRARY_PATH=${EXTRACTOR_PATH} "${EXTRACTOR_PATH}/${EXTRACTOR_BIN}" "${PAT_PATH}" "${EXT_PATH}" >"${LOG_FILE}" 2>&1
if [ $? -ne 0 ]; then RET=$?
return 1
fi
else else
echo "$(TEXT "Extracting ...")" echo "$(TEXT "Extracting ...")"
tar -xf "${PAT_PATH}" -C "${EXT_PATH}" >"${LOG_FILE}" 2>&1 tar -xf "${PAT_PATH}" -C "${EXT_PATH}" >"${LOG_FILE}" 2>&1
if [ $? -ne 0 ]; then RET=$?
return 1
fi
fi fi
if [ ! -f ${EXT_PATH}/grub_cksum.syno ] || if [ ${RET} -ne 0 ] ||
[ ! -f ${EXT_PATH}/grub_cksum.syno ] ||
[ ! -f ${EXT_PATH}/GRUB_VER ] || [ ! -f ${EXT_PATH}/GRUB_VER ] ||
[ ! -f ${EXT_PATH}/zImage ] || [ ! -f ${EXT_PATH}/zImage ] ||
[ ! -f ${EXT_PATH}/rd.gz ]; then [ ! -f ${EXT_PATH}/rd.gz ]; then
echo -e "$(TEXT "pat Invalid, try again!")" >"${LOG_FILE}" echo -e "$(TEXT "pat Invalid, try again!")\nError: ${RET}" >"${LOG_FILE}"
return 1 return 1
fi fi
rm -f "${LOG_FILE}" rm -f "${LOG_FILE}"