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

format

Browse Source
This commit is contained in:
Ing 2023-09-25 14:47:16 +08:00
parent 944b41c310
commit b28256e7e4
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/board/arpl/overlayfs/opt/arpl/include/addons.sh
View File

@ -51,9 +51,9 @@ function installAddon() {
fi fi
# If has files to copy, copy it, else return error # If has files to copy, copy it, else return error
[ ${HAS_FILES} -ne 1 ] && return 1 [ ${HAS_FILES} -ne 1 ] && return 1
cp "${TMP_PATH}/${ADDON}/install.sh" "${RAMDISK_PATH}/addons/${ADDON}.sh" 2>"${LOG_FILE}" || dieLog cp -f "${TMP_PATH}/${ADDON}/install.sh" "${RAMDISK_PATH}/addons/${ADDON}.sh" 2>"${LOG_FILE}" || dieLog
chmod +x "${RAMDISK_PATH}/addons/${ADDON}.sh" chmod +x "${RAMDISK_PATH}/addons/${ADDON}.sh"
[ -d ${TMP_PATH}/${ADDON}/root ] && (cp -R "${TMP_PATH}/${ADDON}/root/"* "${RAMDISK_PATH}/" 2>"${LOG_FILE}" || dieLog) [ -d ${TMP_PATH}/${ADDON}/root ] && (cp -Rf "${TMP_PATH}/${ADDON}/root/"* "${RAMDISK_PATH}/" 2>"${LOG_FILE}" || dieLog)
rm -rf "${TMP_PATH}/${ADDON}" rm -rf "${TMP_PATH}/${ADDON}"
return 0 return 0
} }
@ -69,6 +69,6 @@ function untarAddon() {
ADDON=$(readConfigKey "name" "${TMP_PATH}/addon/manifest.yml") ADDON=$(readConfigKey "name" "${TMP_PATH}/addon/manifest.yml")
[ -z "${ADDON}" ] && return [ -z "${ADDON}" ] && return
rm -rf "${ADDONS_PATH}/${ADDON}" rm -rf "${ADDONS_PATH}/${ADDON}"
mv "${TMP_PATH}/addon" "${ADDONS_PATH}/${ADDON}" mv -f "${TMP_PATH}/addon" "${ADDONS_PATH}/${ADDON}"
echo "${ADDON}" echo "${ADDON}"
} }

44
files/board/arpl/overlayfs/opt/arpl/menu.sh
View File

@ -281,7 +281,7 @@ function addonMenu() {
case "$(<${TMP_PATH}/resp)" in case "$(<${TMP_PATH}/resp)" in
a) a)
NEXT='a' NEXT='a'
rm "${TMP_PATH}/menu" rm -f "${TMP_PATH}/menu"
while read ADDON DESC; do while read ADDON DESC; do
arrayExistItem "${ADDON}" "${!ADDONS[@]}" && continue # Check if addon has already been added arrayExistItem "${ADDON}" "${!ADDONS[@]}" && continue # Check if addon has already been added
echo "${ADDON} \"${DESC}\"" >>"${TMP_PATH}/menu" echo "${ADDON} \"${DESC}\"" >>"${TMP_PATH}/menu"
@ -798,7 +798,7 @@ function extractDsmFiles() {
fi fi
STATUS=$(curl -k -w "%{http_code}" -L "${PATURL}" -o "${PAT_PATH}" --progress-bar) STATUS=$(curl -k -w "%{http_code}" -L "${PATURL}" -o "${PAT_PATH}" --progress-bar)
if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
rm "${PAT_PATH}" rm -f "${PAT_PATH}"
dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
--msgbox "$(TEXT "Check internet or cache disk space")" 0 0 --msgbox "$(TEXT "Check internet or cache disk space")" 0 0
return 1 return 1
@ -860,7 +860,7 @@ function extractDsmFiles() {
fi fi
STATUS=$(curl -k -w "%{http_code}" -L "${OLDPATURL}" -o "${OLDPAT_PATH}" --progress-bar) STATUS=$(curl -k -w "%{http_code}" -L "${OLDPATURL}" -o "${OLDPAT_PATH}" --progress-bar)
if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
rm "${OLDPAT_PATH}" rm -f "${OLDPAT_PATH}"
dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
--msgbox "$(TEXT "Check internet or cache disk space")" 0 0 --msgbox "$(TEXT "Check internet or cache disk space")" 0 0
return 1 return 1
@ -885,9 +885,9 @@ function extractDsmFiles() {
) >/dev/null 2>&1 || true ) >/dev/null 2>&1 || true
# Copy only necessary files # Copy only necessary files
for f in libcurl.so.4 libmbedcrypto.so.5 libmbedtls.so.13 libmbedx509.so.1 libmsgpackc.so.2 libsodium.so libsynocodesign-ng-virtual-junior-wins.so.7; do for f in libcurl.so.4 libmbedcrypto.so.5 libmbedtls.so.13 libmbedx509.so.1 libmsgpackc.so.2 libsodium.so libsynocodesign-ng-virtual-junior-wins.so.7; do
cp "${RAMDISK_PATH}/usr/lib/${f}" "${EXTRACTOR_PATH}" cp -f "${RAMDISK_PATH}/usr/lib/${f}" "${EXTRACTOR_PATH}"
done done
cp "${RAMDISK_PATH}/usr/syno/bin/scemd" "${EXTRACTOR_PATH}/${EXTRACTOR_BIN}" cp -f "${RAMDISK_PATH}/usr/syno/bin/scemd" "${EXTRACTOR_PATH}/${EXTRACTOR_BIN}"
rm -rf "${RAMDISK_PATH}" rm -rf "${RAMDISK_PATH}"
fi fi
# Uses the extractor to untar pat file # Uses the extractor to untar pat file
@ -917,12 +917,12 @@ function extractDsmFiles() {
echo "$(TEXT "OK")" echo "$(TEXT "OK")"
echo -n "$(TEXT "Copying files: ")" echo -n "$(TEXT "Copying files: ")"
cp "${UNTAR_PAT_PATH}/grub_cksum.syno" "${BOOTLOADER_PATH}" cp -f "${UNTAR_PAT_PATH}/grub_cksum.syno" "${BOOTLOADER_PATH}"
cp "${UNTAR_PAT_PATH}/GRUB_VER" "${BOOTLOADER_PATH}" cp -f "${UNTAR_PAT_PATH}/GRUB_VER" "${BOOTLOADER_PATH}"
cp "${UNTAR_PAT_PATH}/grub_cksum.syno" "${SLPART_PATH}" cp -f "${UNTAR_PAT_PATH}/grub_cksum.syno" "${SLPART_PATH}"
cp "${UNTAR_PAT_PATH}/GRUB_VER" "${SLPART_PATH}" cp -f "${UNTAR_PAT_PATH}/GRUB_VER" "${SLPART_PATH}"
cp "${UNTAR_PAT_PATH}/zImage" "${ORI_ZIMAGE_FILE}" cp -f "${UNTAR_PAT_PATH}/zImage" "${ORI_ZIMAGE_FILE}"
cp "${UNTAR_PAT_PATH}/rd.gz" "${ORI_RDGZ_FILE}" cp -f "${UNTAR_PAT_PATH}/rd.gz" "${ORI_RDGZ_FILE}"
rm -rf "${UNTAR_PAT_PATH}" rm -rf "${UNTAR_PAT_PATH}"
echo "$(TEXT "OK")" echo "$(TEXT "OK")"
} }
@ -996,7 +996,7 @@ function make() {
function advancedMenu() { function advancedMenu() {
NEXT="l" NEXT="l"
while true; do while true; do
rm "${TMP_PATH}/menu" rm -f "${TMP_PATH}/menu"
if [ -n "${PRODUCTVER}" ]; then if [ -n "${PRODUCTVER}" ]; then
echo "l \"$(TEXT "Switch LKM version:") \Z4${LKM}\Zn\"" >>"${TMP_PATH}/menu" echo "l \"$(TEXT "Switch LKM version:") \Z4${LKM}\Zn\"" >>"${TMP_PATH}/menu"
fi fi
@ -1219,7 +1219,7 @@ function advancedMenu() {
for I in $(ls /dev/sd*1 2>/dev/null | grep -v "${LOADER_DISK}1"); do for I in $(ls /dev/sd*1 2>/dev/null | grep -v "${LOADER_DISK}1"); do
mount ${I} "${TMP_PATH}/sdX1" mount ${I} "${TMP_PATH}/sdX1"
if [ -f "${TMP_PATH}/sdX1/etc/shadow" ]; then if [ -f "${TMP_PATH}/sdX1/etc/shadow" ]; then
cp "${TMP_PATH}/sdX1/etc/shadow" "${TMP_PATH}/shadow_bak" cp -f "${TMP_PATH}/sdX1/etc/shadow" "${TMP_PATH}/shadow_bak"
SHADOW_FILE="${TMP_PATH}/shadow_bak" SHADOW_FILE="${TMP_PATH}/shadow_bak"
fi fi
umount "${I}" umount "${I}"
@ -1280,7 +1280,7 @@ function advancedMenu() {
xz -dc <"${ARPL_RAMDISK_FILE}" | cpio -idm xz -dc <"${ARPL_RAMDISK_FILE}" | cpio -idm
) >/dev/null 2>&1 || true ) >/dev/null 2>&1 || true
rm -rf "${RDXZ_PATH}/opt/arpl" rm -rf "${RDXZ_PATH}/opt/arpl"
cp -rf "/opt" "${RDXZ_PATH}/" cp -Rf "/opt" "${RDXZ_PATH}/"
( (
cd "${RDXZ_PATH}" cd "${RDXZ_PATH}"
find . 2>/dev/null | cpio -o -H newc -R root:root | xz --check=crc32 >"${ARPL_RAMDISK_FILE}" find . 2>/dev/null | cpio -o -H newc -R root:root | xz --check=crc32 >"${ARPL_RAMDISK_FILE}"
@ -1453,8 +1453,8 @@ function tryRecoveryDSM() {
if [ -n "${MODEL}" ]; then if [ -n "${MODEL}" ]; then
productversMenu "${majorversion}.${minorversion}" productversMenu "${majorversion}.${minorversion}"
if [ -n "${PRODUCTVER}" ]; then if [ -n "${PRODUCTVER}" ]; then
cp "${DSMROOT_PATH}/.syno/patch/zImage" "${SLPART_PATH}" cp -f "${DSMROOT_PATH}/.syno/patch/zImage" "${SLPART_PATH}"
cp "${DSMROOT_PATH}/.syno/patch/rd.gz" "${SLPART_PATH}" cp -f "${DSMROOT_PATH}/.syno/patch/rd.gz" "${SLPART_PATH}"
MSG="$(printf "$(TEXT "Found a installation:\nModel: %s\nProductversion: %s")" "${MODEL}" "${PRODUCTVER}")" MSG="$(printf "$(TEXT "Found a installation:\nModel: %s\nProductversion: %s")" "${MODEL}" "${PRODUCTVER}")"
SN=$(_get_conf_kv SN "${DSMROOT_PATH}/etc/synoinfo.conf") SN=$(_get_conf_kv SN "${DSMROOT_PATH}/etc/synoinfo.conf")
if [ -n "${SN}" ]; then if [ -n "${SN}" ]; then
@ -1484,7 +1484,7 @@ function editUserConfig() {
dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Edit with caution")" \ dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Edit with caution")" \
--editbox "${USER_CONFIG_FILE}" 0 0 2>"${TMP_PATH}/userconfig" --editbox "${USER_CONFIG_FILE}" 0 0 2>"${TMP_PATH}/userconfig"
[ $? -ne 0 ] && return [ $? -ne 0 ] && return
mv "${TMP_PATH}/userconfig" "${USER_CONFIG_FILE}" mv -f "${TMP_PATH}/userconfig" "${USER_CONFIG_FILE}"
ERRORS=$(yq eval "${USER_CONFIG_FILE}" 2>&1) ERRORS=$(yq eval "${USER_CONFIG_FILE}" 2>&1)
[ $? -eq 0 ] && break [ $? -eq 0 ] && break
dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Edit with caution")" \ dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Edit with caution")" \
@ -1660,7 +1660,7 @@ function updateArpl() {
tar -zxf "${TMP_PATH}/$(basename "${KEY}").tgz" -C "${VALUE}" tar -zxf "${TMP_PATH}/$(basename "${KEY}").tgz" -C "${VALUE}"
else else
mkdir -p "$(dirname "${VALUE}")" mkdir -p "$(dirname "${VALUE}")"
mv "${TMP_PATH}/$(basename "${KEY}")" "${VALUE}" mv -f "${TMP_PATH}/$(basename "${KEY}")" "${VALUE}"
fi fi
done < <(readConfigMap "replace" "${TMP_PATH}/update-list.yml") done < <(readConfigMap "replace" "${TMP_PATH}/update-list.yml")
dialog --backtitle "$(backtitle)" --colors --title "${T}" \ dialog --backtitle "$(backtitle)" --colors --title "${T}" \
@ -1724,7 +1724,7 @@ function updateMenu() {
CUR_LKMS_VER="$(cat "${CACHE_PATH}/lkms/VERSION" 2>/dev/null)" CUR_LKMS_VER="$(cat "${CACHE_PATH}/lkms/VERSION" 2>/dev/null)"
PROXY="$(readConfigKey "proxy" "${USER_CONFIG_FILE}")" PROXY="$(readConfigKey "proxy" "${USER_CONFIG_FILE}")"
[ -n "${PROXY}" ] && [[ "${PROXY: -1}" != "/" ]] && PROXY="${PROXY}/" [ -n "${PROXY}" ] && [[ "${PROXY: -1}" != "/" ]] && PROXY="${PROXY}/"
rm "${TMP_PATH}/menu" rm -f "${TMP_PATH}/menu"
echo "a \"$(TEXT "Update all")\"" >>"${TMP_PATH}/menu" echo "a \"$(TEXT "Update all")\"" >>"${TMP_PATH}/menu"
echo "r \"$(TEXT "Update arpl")(${CUR_ARPL_VER:-None})\"" >>"${TMP_PATH}/menu" echo "r \"$(TEXT "Update arpl")(${CUR_ARPL_VER:-None})\"" >>"${TMP_PATH}/menu"
echo "d \"$(TEXT "Update addons")(${CUR_ADDONS_VER:-None})\"" >>"${TMP_PATH}/menu" echo "d \"$(TEXT "Update addons")(${CUR_ADDONS_VER:-None})\"" >>"${TMP_PATH}/menu"
@ -1841,8 +1841,8 @@ function updateMenu() {
dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Update")" \ dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Update")" \
--msgbox "$(TEXT "Not a valid file, please try again!")" 0 0 --msgbox "$(TEXT "Not a valid file, please try again!")" 0 0
else else
rm "${TMP_PATH}/${USER_FILE}" rm -f "${TMP_PATH}/${USER_FILE}"
mv "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/${USER_FILE}" mv -f "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/${USER_FILE}"
if [ "${USER_FILE}" = "update.zip" ]; then if [ "${USER_FILE}" = "update.zip" ]; then
updateArpl "arpl" updateArpl "arpl"
elif [ "${USER_FILE}" = "addons.zip" ]; then elif [ "${USER_FILE}" = "addons.zip" ]; then
@ -1873,7 +1873,7 @@ function notepadMenu() {
dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Edit")" \ dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Edit")" \
--editbox "${USER_UP_PATH}/notepad" 0 0 2>"${TMP_PATH}/notepad" --editbox "${USER_UP_PATH}/notepad" 0 0 2>"${TMP_PATH}/notepad"
[ $? -ne 0 ] && return [ $? -ne 0 ] && return
mv "${TMP_PATH}/notepad" "${USER_UP_PATH}/notepad" mv -f "${TMP_PATH}/notepad" "${USER_UP_PATH}/notepad"
} }
############################################################################### ###############################################################################

6
files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
View File

@ -118,7 +118,7 @@ _set_conf_kv "SN" "${SN}" "${RAMDISK_PATH}/etc/synoinfo.conf" >"${LOG_FILE}" 2>&
echo -n "." echo -n "."
grep -v -e '^[\t ]*#' -e '^$' "${PATCH_PATH}/config-manipulators.sh" >"${TMP_PATH}/rp.txt" grep -v -e '^[\t ]*#' -e '^$' "${PATCH_PATH}/config-manipulators.sh" >"${TMP_PATH}/rp.txt"
sed -e "/@@@CONFIG-MANIPULATORS-TOOLS@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e '}' -i "${RAMDISK_PATH}/sbin/init.post" sed -e "/@@@CONFIG-MANIPULATORS-TOOLS@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e '}' -i "${RAMDISK_PATH}/sbin/init.post"
rm "${TMP_PATH}/rp.txt" rm -f "${TMP_PATH}/rp.txt"
touch "${TMP_PATH}/rp.txt" touch "${TMP_PATH}/rp.txt"
for KEY in ${!SYNOINFO[@]}; do for KEY in ${!SYNOINFO[@]}; do
echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc/synoinfo.conf'" >>"${TMP_PATH}/rp.txt" echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc/synoinfo.conf'" >>"${TMP_PATH}/rp.txt"
@ -127,7 +127,7 @@ done
echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc/synoinfo.conf'" >>"${TMP_PATH}/rp.txt" echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc/synoinfo.conf'" >>"${TMP_PATH}/rp.txt"
echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc.defaults/synoinfo.conf'" >>"${TMP_PATH}/rp.txt" echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc.defaults/synoinfo.conf'" >>"${TMP_PATH}/rp.txt"
sed -e "/@@@CONFIG-GENERATED@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e '}' -i "${RAMDISK_PATH}/sbin/init.post" sed -e "/@@@CONFIG-GENERATED@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e '}' -i "${RAMDISK_PATH}/sbin/init.post"
rm "${TMP_PATH}/rp.txt" rm -f "${TMP_PATH}/rp.txt"
echo -n "." echo -n "."
# Extract modules to ramdisk # Extract modules to ramdisk
@ -150,7 +150,7 @@ rm -rf "${TMP_PATH}/modules"
echo -n "." echo -n "."
# Copying fake modprobe # Copying fake modprobe
cp "${PATCH_PATH}/iosched-trampoline.sh" "${RAMDISK_PATH}/usr/sbin/modprobe" cp -f "${PATCH_PATH}/iosched-trampoline.sh" "${RAMDISK_PATH}/usr/sbin/modprobe"
# Copying LKM to /usr/lib/modules # Copying LKM to /usr/lib/modules
gzip -dc "${LKM_PATH}/rp-${PLATFORM}-$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}-${LKM}.ko.gz" >"${RAMDISK_PATH}/usr/lib/modules/rp.ko" gzip -dc "${LKM_PATH}/rp-${PLATFORM}-$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}-${LKM}.ko.gz" >"${RAMDISK_PATH}/usr/lib/modules/rp.ko"

4
scripts/func.sh
View File

@ -57,9 +57,9 @@ function getExtractor() {
# Copy only necessary files # Copy only necessary files
for f in libcurl.so.4 libmbedcrypto.so.5 libmbedtls.so.13 libmbedx509.so.1 libmsgpackc.so.2 libsodium.so libsynocodesign-ng-virtual-junior-wins.so.7; do for f in libcurl.so.4 libmbedcrypto.so.5 libmbedtls.so.13 libmbedx509.so.1 libmsgpackc.so.2 libsodium.so libsynocodesign-ng-virtual-junior-wins.so.7; do
cp "${CACHE_DIR}/ramdisk/usr/lib/${f}" "${DEST_PATH}" cp -f "${CACHE_DIR}/ramdisk/usr/lib/${f}" "${DEST_PATH}"
done done
cp "${CACHE_DIR}/ramdisk/usr/syno/bin/scemd" "${DEST_PATH}/syno_extract_system_patch" cp -f "${CACHE_DIR}/ramdisk/usr/syno/bin/scemd" "${DEST_PATH}/syno_extract_system_patch"
# Clean up # Clean up
rm -rf ${CACHE_DIR} rm -rf ${CACHE_DIR}