mirror of
https://github.com/RROrg/rr.git
synced 2026-01-15 07:49:38 +08:00
更新 menu.sh 脚本的条件判断,支持在无参数情况下执行
This commit is contained in:
parent
262559fa06
commit
9dc8c85fee
2
.github/workflows/data.yml
vendored
2
.github/workflows/data.yml
vendored
@ -65,7 +65,7 @@ jobs:
|
|||||||
sudo losetup -P "${LOOPX}" "rr/rr.img"
|
sudo losetup -P "${LOOPX}" "rr/rr.img"
|
||||||
rm -rf "/tmp/mnt/p3"
|
rm -rf "/tmp/mnt/p3"
|
||||||
mkdir -p "/tmp/mnt/p3"
|
mkdir -p "/tmp/mnt/p3"
|
||||||
mount "${LOOPX}p3" "/tmp/mnt/p3"
|
sudo mount "${LOOPX}p3" "/tmp/mnt/p3"
|
||||||
unpackInitrd /tmp/mnt/p3/initrd-rr "rr/initrd"
|
unpackInitrd /tmp/mnt/p3/initrd-rr "rr/initrd"
|
||||||
|
|
||||||
sudo apt update
|
sudo apt update
|
||||||
|
|||||||
2
.github/workflows/issues.yml
vendored
2
.github/workflows/issues.yml
vendored
@ -193,7 +193,7 @@ jobs:
|
|||||||
|
|
||||||
echo "Building..."
|
echo "Building..."
|
||||||
{
|
{
|
||||||
echo ". include/functions.sh"
|
echo ". menu.sh"
|
||||||
[ -n "${{ env.language }}" ] && echo "echo \"${{ env.language }}.UTF-8\" >/mnt/p1/.locale"
|
[ -n "${{ env.language }}" ] && echo "echo \"${{ env.language }}.UTF-8\" >/mnt/p1/.locale"
|
||||||
[ -n "${{ env.tips }}" ] && echo "echo -e \"${{ env.tips }}\" >/mnt/p3/AddTips"
|
[ -n "${{ env.tips }}" ] && echo "echo -e \"${{ env.tips }}\" >/mnt/p3/AddTips"
|
||||||
[ -n "${{ env.kernel }}" ] && echo "writeConfigKey \"kernel\" \"${{ env.kernel }}\" \"\${USER_CONFIG_FILE}\""
|
[ -n "${{ env.kernel }}" ] && echo "writeConfigKey \"kernel\" \"${{ env.kernel }}\" \"\${USER_CONFIG_FILE}\""
|
||||||
|
|||||||
@ -4067,8 +4067,9 @@ function notepadMenu() {
|
|||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
###############################################################################
|
###############################################################################
|
||||||
if [ $# -ge 1 ]; then
|
if [ ! "$(basename -- "${0}")" = "$(basename -- "${BASH_SOURCE[0]}")" ] && [ $# -gt 0 ]; then
|
||||||
"$@"
|
"$@"
|
||||||
|
cleanup_lock
|
||||||
else
|
else
|
||||||
if [ -z "${MODEL}" ] && [ -z "${PRODUCTVER}" ] && [ -n "$(findDSMRoot)" ]; then
|
if [ -z "${MODEL}" ] && [ -z "${PRODUCTVER}" ] && [ -n "$(findDSMRoot)" ]; then
|
||||||
DIALOG --title "$(TEXT "Main menu")" \
|
DIALOG --title "$(TEXT "Main menu")" \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user