From a0ac04945fcdbb501dd0f8f9904ee76665981784 Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Mon, 1 Apr 2024 18:48:44 +0800
Subject: [PATCH] fix something

---
 files/initrd/opt/rr/menu.sh |  1 +
 localbuild.sh               | 10 ++---
 sourcebuild.sh              | 76 +++++++++++++++++++++++++------------
 3 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh
index 488733b3..ffc629c3 100755
--- a/files/initrd/opt/rr/menu.sh
+++ b/files/initrd/opt/rr/menu.sh
@@ -2609,6 +2609,7 @@ function downloadExts() {
   fi
   TAG=""
   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/')"
   else
     LATESTURL="$(curl -skL --connect-timeout 10 -w %{url_effective} -o /dev/null "${PROXY}${3}/releases/latest")"
diff --git a/localbuild.sh b/localbuild.sh
index b053fb8b..78096a6d 100755
--- a/localbuild.sh
+++ b/localbuild.sh
@@ -33,7 +33,7 @@ function init() {
 
   sudo apt-get update
   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)
   if [ -z "${YQ}" ] || ! ${YQ} --version 2>/dev/null | grep -q "v4."; then
@@ -167,16 +167,16 @@ function pack() {
   )
 
   echo "Pack image file"
-  cp -af "${CHROOT_PATH}/mnt/p1/.locale" "/tmp/mnt/p1" 2>/dev/null
-  cp -rf "${CHROOT_PATH}/mnt/p1/"* "/tmp/mnt/p1" || (
+  sudo cp -af "${CHROOT_PATH}/mnt/p1/.locale" "/tmp/mnt/p1" 2>/dev/null
+  sudo cp -rf "${CHROOT_PATH}/mnt/p1/"* "/tmp/mnt/p1" || (
     echo -e "Can't cp ${LOOPX}p1."
     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."
     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."
     exit 1
   )
diff --git a/sourcebuild.sh b/sourcebuild.sh
index a854e4d1..a013f671 100755
--- a/sourcebuild.sh
+++ b/sourcebuild.sh
@@ -6,14 +6,20 @@
 # See /LICENSE for more information.
 #
 # sudo apt update
-# sudo apt install -y locales busybox dialog
-# 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 apt install -y locales busybox dialog curl xz-utils cpio sed
+# 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}"
 #
 
 set -e
 
+PROMPT=$(sudo -nv 2>&1)
+if [ $? -ne 0 ]; then
+  echo "This script must be run as root"
+  exit 1
+fi
+
 PRE="true"
 
 . scripts/func.sh
@@ -31,18 +37,21 @@ 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
+  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
+      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}"
@@ -58,24 +67,41 @@ LOOPX=$(sudo losetup -f)
 sudo losetup -P "${LOOPX}" "${IMAGE_FILE}"
 
 echo "Mounting image file"
-sudo rm -rf "/tmp/mnt/p1"
-sudo rm -rf "/tmp/mnt/p2"
-sudo rm -rf "/tmp/mnt/p3"
-sudo mkdir -p "/tmp/mnt/p1"
-sudo mkdir -p "/tmp/mnt/p2"
-sudo mkdir -p "/tmp/mnt/p3"
-sudo mount ${LOOPX}p1 "/tmp/mnt/p1"
-sudo mount ${LOOPX}p2 "/tmp/mnt/p2"
-sudo mount ${LOOPX}p3 "/tmp/mnt/p3"
-
+rm -rf "/tmp/mnt/p1"
+rm -rf "/tmp/mnt/p2"
+rm -rf "/tmp/mnt/p3"
+mkdir -p "/tmp/mnt/p1"
+mkdir -p "/tmp/mnt/p2"
+mkdir -p "/tmp/mnt/p3"
+sudo mount ${LOOPX}p1 "/tmp/mnt/p1" || (
+  echo -e "Can't mount ${LOOPX}p1."
+  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"
 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/p2/"* "/tmp/mnt/p2"
-sudo cp -Rf "files/mnt/p3/"* "/tmp/mnt/p3"
+sudo cp -rf "files/mnt/p1/"* "/tmp/mnt/p1" || (
+  echo -e "Can't cp ${LOOPX}p1."
+  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
 sha256sum update-list.yml update-check.sh >sha256sum
@@ -104,4 +130,4 @@ sudo losetup --detach ${LOOPX}
 if [ -n "${1}" ]; then
   echo "Packing image file"
   sudo mv "${IMAGE_FILE}" "rr-${1}.img"
-fi
\ No newline at end of file
+fi