diff --git a/README.md b/README.md index f2176608..21002450 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@

RR: redpill’s preinstallation and recovery environment

[![点击数](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https://github.com/rrorg/rr&edge_flat=true)](https://github.com/rrorg/rr) -[![GitHub Release](https://img.shields.io/github/v/release/rrorg/rr?style=flat-square)](https://github.com/rrorg/rr/releases/latest) -[![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/rrorg/rr/total?style=flat-square)](https://github.com/rrorg/rr/releases) -[![GitHub Issues or Pull Requests by label](https://img.shields.io/github/issues-closed-raw/rrorg/rr/custom?style=flat-square&label=custom)](https://rrorg.github.io/rr/) +[![GitHub Release](https://img.shields.io/github/v/release/rrorg/rr?logo=github&style=flat-square)](https://github.com/rrorg/rr/releases/latest) +[![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/rrorg/rr/total?logo=github&style=flat-square)](https://github.com/rrorg/rr/releases) +[![GitHub Issues or Pull Requests by label](https://img.shields.io/github/issues-closed-raw/rrorg/rr/custom?logo=github&style=flat-square&label=custom)](https://rrorg.github.io/rr/) > The ultimate solution to self-centralized Synology DSM OS on any local machine with any x86/x64 CPU architecture via a single flash of bootload pre-installation process in addition within recovery environment. diff --git a/files/initrd/opt/rr/include/configFile.sh b/files/initrd/opt/rr/include/configFile.sh index fe5c5e9b..71b7e9e9 100755 --- a/files/initrd/opt/rr/include/configFile.sh +++ b/files/initrd/opt/rr/include/configFile.sh @@ -67,4 +67,4 @@ function readConfigEntriesArray() { # Returns error information function checkConfigFile() { yq eval "${1}" 2>&1 -} \ No newline at end of file +} diff --git a/sourcebuild.sh b/sourcebuild.sh index f4e65e50..7411ae87 100755 --- a/sourcebuild.sh +++ b/sourcebuild.sh @@ -37,26 +37,16 @@ convertpo2mo "files/initrd/opt/rr/lang" repackInitrd "files/p3/initrd-rr" "files/initrd" if [ -n "${1}" ]; then - if echo "$( - cd "files/initrd/opt/rr/model-configs" 2>/dev/null - ls *.yml 2>/dev/null | cut -d'.' -f1 - )" | grep -q "${1}"; then - echo "Model found: ${1}" - export LOADER_DISK="LOCALBUILD" - export CHROOT_PATH="$(realpath files)" - ( - cd "${CHROOT_PATH}/initrd/opt/rr" - # sed -i 's/rd-compressed:.*$/rd-compressed: true/g' "model-configs/${1}.yml" - ./init.sh - ./menu.sh modelMenu "${1}" - ./menu.sh productversMenu "7.2" - ./menu.sh make -1 - ./menu.sh cleanCache -1 - ) - else - echo "Model not found: ${1}" - exit 1 - fi + export LOADER_DISK="LOCALBUILD" + export CHROOT_PATH="$(realpath files)" + ( + cd "${CHROOT_PATH}/initrd/opt/rr" + ./init.sh + ./menu.sh modelMenu "${1}" + ./menu.sh productversMenu "7.2" + ./menu.sh make -1 + ./menu.sh cleanCache -1 + ) fi IMAGE_FILE="rr.img"