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 something

Browse Source
This commit is contained in:
Ing 2024-04-01 18:48:44 +08:00
parent 9170de389b
commit a0ac04945f
3 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2609,6 +2609,7 @@ function downloadExts() {
fi fi
TAG="" TAG=""
if [ "${PRERELEASE}" = "true" ]; then if [ "${PRERELEASE}" = "true" ]; then
# TAG="$(curl -skL --connect-timeout 10 "${PROXY}${3}/tags" | pup 'a[class="Link--muted"] attr{href}' | grep ".zip" | head -1)"
TAG="$(curl -skL --connect-timeout 10 "${PROXY}${3}/tags" | grep /refs/tags/.*\.zip | head -1 | sed -r 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/')" TAG="$(curl -skL --connect-timeout 10 "${PROXY}${3}/tags" | grep /refs/tags/.*\.zip | head -1 | sed -r 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/')"
else else
LATESTURL="$(curl -skL --connect-timeout 10 -w %{url_effective} -o /dev/null "${PROXY}${3}/releases/latest")" LATESTURL="$(curl -skL --connect-timeout 10 -w %{url_effective} -o /dev/null "${PROXY}${3}/releases/latest")"

10
localbuild.sh
View File

@ -33,7 +33,7 @@ function init() {
sudo apt-get update sudo apt-get update
sudo apt-get install -y locales busybox dialog curl xz-utils cpio sed sudo apt-get install -y locales busybox dialog curl xz-utils cpio sed
sudo locale-gen en_US.UTF-8 ko_KR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_HK.UTF-8 zh_TW.UTF-8 sudo locale-gen en_US.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_HK.UTF-8 zh_TW.UTF-8
YQ=$(command -v yq) YQ=$(command -v yq)
if [ -z "${YQ}" ] || ! ${YQ} --version 2>/dev/null | grep -q "v4."; then if [ -z "${YQ}" ] || ! ${YQ} --version 2>/dev/null | grep -q "v4."; then
@ -167,16 +167,16 @@ function pack() {
) )
echo "Pack image file" echo "Pack image file"
cp -af "${CHROOT_PATH}/mnt/p1/.locale" "/tmp/mnt/p1" 2>/dev/null sudo cp -af "${CHROOT_PATH}/mnt/p1/.locale" "/tmp/mnt/p1" 2>/dev/null
cp -rf "${CHROOT_PATH}/mnt/p1/"* "/tmp/mnt/p1" || ( sudo cp -rf "${CHROOT_PATH}/mnt/p1/"* "/tmp/mnt/p1" || (
echo -e "Can't cp ${LOOPX}p1." echo -e "Can't cp ${LOOPX}p1."
exit 1 exit 1
) )
cp -rf "${CHROOT_PATH}/mnt/p2/"* "/tmp/mnt/p2" || ( sudo cp -rf "${CHROOT_PATH}/mnt/p2/"* "/tmp/mnt/p2" || (
echo -e "Can't cp ${LOOPX}p1." echo -e "Can't cp ${LOOPX}p1."
exit 1 exit 1
) )
cp -rf "${CHROOT_PATH}/mnt/p3/"* "/tmp/mnt/p3" || ( sudo cp -rf "${CHROOT_PATH}/mnt/p3/"* "/tmp/mnt/p3" || (
echo -e "Can't cp ${LOOPX}p1." echo -e "Can't cp ${LOOPX}p1."
exit 1 exit 1
) )

62
sourcebuild.sh
View File

@ -6,14 +6,20 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
# sudo apt update # sudo apt update
# sudo apt install -y locales busybox dialog # sudo apt install -y locales busybox dialog curl xz-utils cpio sed
# sudo locale-gen en_US.UTF-8 ko_KR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_HK.UTF-8 zh_TW.UTF-8 # sudo locale-gen en_US.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_HK.UTF-8 zh_TW.UTF-8
# #
# export TOKEN="${1}" # export TOKEN="${1}"
# #
set -e set -e
PROMPT=$(sudo -nv 2>&1)
if [ $? -ne 0 ]; then
echo "This script must be run as root"
exit 1
fi
PRE="true" PRE="true"
. scripts/func.sh . scripts/func.sh
@ -31,7 +37,10 @@ convertpo2mo "files/initrd/opt/rr/lang"
repackInitrd "files/p3/initrd-rr" "files/initrd" repackInitrd "files/p3/initrd-rr" "files/initrd"
if [ -n "${1}" ]; then 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 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}" echo "Model found: ${1}"
export LOADER_DISK="LOCALBUILD" export LOADER_DISK="LOCALBUILD"
export CHROOT_PATH="$(realpath files)" export CHROOT_PATH="$(realpath files)"
@ -42,7 +51,7 @@ if [ -n "${1}" ]; then
./menu.sh modelMenu "${1}" ./menu.sh modelMenu "${1}"
./menu.sh productversMenu "7.2" ./menu.sh productversMenu "7.2"
./menu.sh make -1 ./menu.sh make -1
./menu.sh cleanCache ./menu.sh cleanCache -1
) )
else else
echo "Model not found: ${1}" echo "Model not found: ${1}"
@ -58,24 +67,41 @@ LOOPX=$(sudo losetup -f)
sudo losetup -P "${LOOPX}" "${IMAGE_FILE}" sudo losetup -P "${LOOPX}" "${IMAGE_FILE}"
echo "Mounting image file" echo "Mounting image file"
sudo rm -rf "/tmp/mnt/p1" rm -rf "/tmp/mnt/p1"
sudo rm -rf "/tmp/mnt/p2" rm -rf "/tmp/mnt/p2"
sudo rm -rf "/tmp/mnt/p3" rm -rf "/tmp/mnt/p3"
sudo mkdir -p "/tmp/mnt/p1" mkdir -p "/tmp/mnt/p1"
sudo mkdir -p "/tmp/mnt/p2" mkdir -p "/tmp/mnt/p2"
sudo mkdir -p "/tmp/mnt/p3" mkdir -p "/tmp/mnt/p3"
sudo mount ${LOOPX}p1 "/tmp/mnt/p1" sudo mount ${LOOPX}p1 "/tmp/mnt/p1" || (
sudo mount ${LOOPX}p2 "/tmp/mnt/p2" echo -e "Can't mount ${LOOPX}p1."
sudo mount ${LOOPX}p3 "/tmp/mnt/p3" exit 1
)
sudo mount ${LOOPX}p2 "/tmp/mnt/p2" || (
echo -e "Can't mount ${LOOPX}p1."
exit 1
)
sudo mount ${LOOPX}p3 "/tmp/mnt/p3" || (
echo -e "Can't mount ${LOOPX}p1."
exit 1
)
echo "Copying files" echo "Copying files"
sudo cp -af "files/mnt/p1/.locale" "/tmp/mnt/p1" 2>/dev/null sudo cp -af "files/mnt/p1/.locale" "/tmp/mnt/p1" 2>/dev/null
sudo cp -Rf "files/mnt/p1/"* "/tmp/mnt/p1" sudo cp -rf "files/mnt/p1/"* "/tmp/mnt/p1" || (
sudo cp -Rf "files/mnt/p2/"* "/tmp/mnt/p2" echo -e "Can't cp ${LOOPX}p1."
sudo cp -Rf "files/mnt/p3/"* "/tmp/mnt/p3" exit 1
)
cp -rf "files/mnt/p2/"* "/tmp/mnt/p2" || (
echo -e "Can't cp ${LOOPX}p1."
exit 1
)
cp -rf "files/mnt/p3/"* "/tmp/mnt/p3" || (
echo -e "Can't cp ${LOOPX}p1."
exit 1
)
sync sudo sync
# update.zip # update.zip
sha256sum update-list.yml update-check.sh >sha256sum sha256sum update-list.yml update-check.sh >sha256sum