yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-12-17 09:39:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化镜像标签获取逻辑，调整 VMID 生成方式，确保版本信息处理更为灵活

Browse Source
This commit is contained in:
Ing 2025-12-16 13:31:55 +08:00
parent d5dcb28318
commit 57eac55d54
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/pve.sh
View File

@ -95,16 +95,15 @@ if ! command -v qm >/dev/null 2>&1; then
exit 1 exit 1
fi fi
if [ -z "$TAG" ]; then
TAG="$(curl -skL --connect-timeout 10 -w "%{url_effective}" -o /dev/null "${REPO}/releases/latest" | awk -F'/' '{print $NF}' | sed 's/^[v|V]//g')"
fi
if [ -n "${IMG}" ] && [ -f "${IMG}" ]; then if [ -n "${IMG}" ] && [ -f "${IMG}" ]; then
IMG_PATH="${IMG}" IMG_PATH="${IMG}"
else else
if ! command -v curl >/dev/null 2>&1; then if ! command -v curl >/dev/null 2>&1; then
apt-get update >/dev/null 2>&1 && apt-get install -y curl >/dev/null 2>&1 apt-get update >/dev/null 2>&1 && apt-get install -y curl >/dev/null 2>&1
fi fi
if [ -z "$TAG" ]; then
TAG="$(curl -skL --connect-timeout 10 -w "%{url_effective}" -o /dev/null "${REPO}/releases/latest" | awk -F'/' '{print $NF}' | sed 's/^[v|V]//g')"
fi
rm -f "/tmp/rr-${TAG}.img.zip" rm -f "/tmp/rr-${TAG}.img.zip"
echo "Downloading rr-${TAG}.img.zip ... " echo "Downloading rr-${TAG}.img.zip ... "
STATUS=$(curl -skL --connect-timeout 10 -w "%{http_code}" "${REPO}/releases/download/${TAG}/rr-${TAG}.img.zip" -o "/tmp/rr-${TAG}.img.zip") STATUS=$(curl -skL --connect-timeout 10 -w "%{http_code}" "${REPO}/releases/download/${TAG}/rr-${TAG}.img.zip" -o "/tmp/rr-${TAG}.img.zip")
@ -137,14 +136,9 @@ fi
echo "Creating VM with RR ... " echo "Creating VM with RR ... "
# 获取可用的 VMID # 获取可用的 VMID
last_vmid=$(qm list | awk 'NR>1{print$1}' | sort -n | tail -1 2>/dev/null) LAST_VMID=$(qm list | awk 'NR>1{print$1}' | sort -n | tail -1 2>/dev/null)
if [ -z "$last_vmid" ]; then VMID=$((${LAST_VMID:-99} + 1))
# 如果 last_vmid 是空字符串，说明没有VM，设置一个起始ID
VMID=100
else
# 否则，在最后一个ID的基础上加1
VMID=$((last_vmid + 1))
fi
ARGS="" ARGS=""
SATAIDX=0 SATAIDX=0
@ -232,7 +226,7 @@ qm set ${VMID} --net0 virtio,bridge=${BRIDGE}
qm set ${VMID} --serial0 socket qm set ${VMID} --serial0 socket
qm set ${VMID} --agent enabled=1 qm set ${VMID} --agent enabled=1
qm set ${VMID} --smbios1 "uuid=$(cat /proc/sys/kernel/random/uuid),manufacturer=$(echo -n "RROrg" | base64),product=$(echo -n "RR" | base64),version=$(echo -n "$TAG" | base64),base64=1" qm set ${VMID} --smbios1 "uuid=$(cat /proc/sys/kernel/random/uuid),manufacturer=$(echo -n "RROrg" | base64),product=$(echo -n "RR" | base64),version=$(echo -n "${TAG:-local}" | base64),base64=1"
qm set ${VMID} --onboot "${ONBOOT}" qm set ${VMID} --onboot "${ONBOOT}"
echo "Created success, VMID=${VMID}" echo "Created success, VMID=${VMID}"