mirror of
https://github.com/RROrg/rr.git
synced 2025-08-23 04:58:33 +08:00
添加 Tips 功能,更新相关文件以支持提示信息的显示和存储
This commit is contained in:
parent
84d7425912
commit
506451071d
26
.github/workflows/issues.yml
vendored
26
.github/workflows/issues.yml
vendored
@ -43,6 +43,7 @@ jobs:
|
|||||||
language= ''
|
language= ''
|
||||||
sn = ''
|
sn = ''
|
||||||
macs = ''
|
macs = ''
|
||||||
|
tips = ''
|
||||||
model = ''
|
model = ''
|
||||||
version = ''
|
version = ''
|
||||||
kernel = ''
|
kernel = ''
|
||||||
@ -58,6 +59,7 @@ jobs:
|
|||||||
language = jsonbody.get('language', '')
|
language = jsonbody.get('language', '')
|
||||||
sn = jsonbody.get('sn', '')
|
sn = jsonbody.get('sn', '')
|
||||||
macs = jsonbody.get('macs', '')
|
macs = jsonbody.get('macs', '')
|
||||||
|
tips = jsonbody.get('tips', '')
|
||||||
model = jsonbody.get('model', '')
|
model = jsonbody.get('model', '')
|
||||||
version = jsonbody.get('version', '')
|
version = jsonbody.get('version', '')
|
||||||
kernel = jsonbody.get('kernel', '')
|
kernel = jsonbody.get('kernel', '')
|
||||||
@ -79,6 +81,7 @@ jobs:
|
|||||||
set_output("language", language)
|
set_output("language", language)
|
||||||
set_output("sn", sn)
|
set_output("sn", sn)
|
||||||
set_output("macs", macs)
|
set_output("macs", macs)
|
||||||
|
set_output("tips", tips)
|
||||||
set_output("model", model)
|
set_output("model", model)
|
||||||
set_output("version", version)
|
set_output("version", version)
|
||||||
set_output("kernel", kernel)
|
set_output("kernel", kernel)
|
||||||
@ -248,7 +251,7 @@ jobs:
|
|||||||
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
|
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
|
||||||
writeConfigKey "sn" "${{ env.sn }}" "${USER_CONFIG_FILE}"
|
writeConfigKey "sn" "${{ env.sn }}" "${USER_CONFIG_FILE}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "${{ env.macs }}" ]; then
|
if [ -n "${{ env.macs }}" ]; then
|
||||||
echo "set macs: ${{ env.macs }}"
|
echo "set macs: ${{ env.macs }}"
|
||||||
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
|
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
|
||||||
@ -257,6 +260,11 @@ jobs:
|
|||||||
writeConfigKey "mac2" "${MACS[1]}" "${USER_CONFIG_FILE}"
|
writeConfigKey "mac2" "${MACS[1]}" "${USER_CONFIG_FILE}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -n "${{ env.tips }}" ]; then
|
||||||
|
echo "set tips: ${{ env.tips }}"
|
||||||
|
echo -e "${{ env.tips }}" | sudo tee rr/ws/mnt/p3/AddTips
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -n "${{ env.addons }}" ]; then
|
if [ -n "${{ env.addons }}" ]; then
|
||||||
echo "set addons: ${{ env.addons }}"
|
echo "set addons: ${{ env.addons }}"
|
||||||
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
|
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
|
||||||
@ -415,14 +423,6 @@ jobs:
|
|||||||
----
|
----
|
||||||
emoji: hooray
|
emoji: hooray
|
||||||
|
|
||||||
- name: Close Issues
|
|
||||||
if: env.iscustom == 'true' && success()
|
|
||||||
uses: actions-cool/issues-helper@v3
|
|
||||||
with:
|
|
||||||
actions: 'close-issue'
|
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
issue-number: ${{ github.event.issue.number }}
|
|
||||||
|
|
||||||
- name: Update Comment Fail
|
- name: Update Comment Fail
|
||||||
if: env.iscustom == 'true' && failure()
|
if: env.iscustom == 'true' && failure()
|
||||||
uses: actions-cool/issues-helper@v3
|
uses: actions-cool/issues-helper@v3
|
||||||
@ -437,3 +437,11 @@ jobs:
|
|||||||
> ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
> ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||||
----
|
----
|
||||||
emoji: confused
|
emoji: confused
|
||||||
|
|
||||||
|
- name: Close Issues
|
||||||
|
if: env.iscustom == 'true'
|
||||||
|
uses: actions-cool/issues-helper@v3
|
||||||
|
with:
|
||||||
|
actions: 'close-issue'
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
issue-number: ${{ github.event.issue.number }}
|
||||||
|
@ -107,9 +107,11 @@
|
|||||||
if (debug) {
|
if (debug) {
|
||||||
$('#sn_item').show();
|
$('#sn_item').show();
|
||||||
$('#macs_item').show();
|
$('#macs_item').show();
|
||||||
|
$('#tips_item').show();
|
||||||
} else {
|
} else {
|
||||||
$('#sn_item').hide();
|
$('#sn_item').hide();
|
||||||
$('#macs_item').hide();
|
$('#macs_item').hide();
|
||||||
|
$('#tips_item').hide();
|
||||||
}
|
}
|
||||||
setModels();
|
setModels();
|
||||||
});
|
});
|
||||||
@ -279,7 +281,7 @@
|
|||||||
var body = {};
|
var body = {};
|
||||||
var _parameters = ["title", "format", "size", "template", "language", "model", "version", "kernel", "addons", "modules"];
|
var _parameters = ["title", "format", "size", "template", "language", "model", "version", "kernel", "addons", "modules"];
|
||||||
if (debug) {
|
if (debug) {
|
||||||
_parameters.push("sn", "macs");
|
_parameters.push("sn", "macs", "tips");
|
||||||
}
|
}
|
||||||
for (var key in _parameters) {
|
for (var key in _parameters) {
|
||||||
var name = _parameters[key];
|
var name = _parameters[key];
|
||||||
@ -432,6 +434,14 @@
|
|||||||
<input class="form-control input-contrast input-sm" type="text" id="macs" name="inputs[macs]" value=""></input>
|
<input class="form-control input-contrast input-sm" type="text" id="macs" name="inputs[macs]" value=""></input>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-group mt-1 mb-2" id="tips_item">
|
||||||
|
<div class="form-group-header">
|
||||||
|
<label class="color-fg-default text-mono f6">Tips:</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-group-body">
|
||||||
|
<input class="form-control input-contrast input-sm" type="text" id="tips" name="inputs[tips]" value=""></input>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="form-group mt-1 mb-2" id="model_item">
|
<div class="form-group mt-1 mb-2" id="model_item">
|
||||||
<div class="form-group-header">
|
<div class="form-group-header">
|
||||||
<label class="color-fg-default text-mono f6">Model:</label>
|
<label class="color-fg-default text-mono f6">Model:</label>
|
||||||
|
@ -433,6 +433,7 @@ else
|
|||||||
|
|
||||||
_bootwait || exit 0
|
_bootwait || exit 0
|
||||||
|
|
||||||
|
[ -n "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)" ] && printf "$(TEXT "%s\n")" "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)"
|
||||||
printf "\033[1;37m%s\033[0m\n" "$(TEXT "Loading DSM kernel ...")"
|
printf "\033[1;37m%s\033[0m\n" "$(TEXT "Loading DSM kernel ...")"
|
||||||
|
|
||||||
DSMLOGO="$(readConfigKey "dsmlogo" "${USER_CONFIG_FILE}")"
|
DSMLOGO="$(readConfigKey "dsmlogo" "${USER_CONFIG_FILE}")"
|
||||||
|
@ -38,6 +38,7 @@ RR_RAMUSER_FILE="${PART3_PATH}/initrd-rru"
|
|||||||
MC_RAMDISK_FILE="${PART3_PATH}/microcode.img"
|
MC_RAMDISK_FILE="${PART3_PATH}/microcode.img"
|
||||||
MOD_ZIMAGE_FILE="${PART3_PATH}/zImage-dsm"
|
MOD_ZIMAGE_FILE="${PART3_PATH}/zImage-dsm"
|
||||||
MOD_RDGZ_FILE="${PART3_PATH}/initrd-dsm"
|
MOD_RDGZ_FILE="${PART3_PATH}/initrd-dsm"
|
||||||
|
ADD_TIPS_FILE="${PART3_PATH}/AddTips"
|
||||||
|
|
||||||
CKS_PATH="${PART3_PATH}/cks"
|
CKS_PATH="${PART3_PATH}/cks"
|
||||||
LKMS_PATH="${PART3_PATH}/lkms"
|
LKMS_PATH="${PART3_PATH}/lkms"
|
||||||
|
@ -239,6 +239,7 @@ printf "\n"
|
|||||||
printf "$(TEXT "Call \033[1;32minit.sh\033[0m to re get init info\n")"
|
printf "$(TEXT "Call \033[1;32minit.sh\033[0m to re get init info\n")"
|
||||||
printf "$(TEXT "Call \033[1;32mmenu.sh\033[0m to configure loader\n")"
|
printf "$(TEXT "Call \033[1;32mmenu.sh\033[0m to configure loader\n")"
|
||||||
printf "\n"
|
printf "\n"
|
||||||
|
[ -n "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)" ] && printf "$(TEXT "%s\n")" "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)"
|
||||||
printf "$(TEXT "User config is on \033[1;32m%s\033[0m\n")" "${USER_CONFIG_FILE}"
|
printf "$(TEXT "User config is on \033[1;32m%s\033[0m\n")" "${USER_CONFIG_FILE}"
|
||||||
printf "$(TEXT "HTTP: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${HTTP:-7080}"
|
printf "$(TEXT "HTTP: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${HTTP:-7080}"
|
||||||
printf "$(TEXT "DUFS: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${DUFS:-7304}"
|
printf "$(TEXT "DUFS: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${DUFS:-7304}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user