twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-02-24 05:20:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Message variables

Browse Source 
* fix: Message variables
This commit is contained in:
Kroese 2023-12-10 16:54:02 +01:00 committed by GitHub
parent 26d6fa9fcc
commit 007d20c315
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/check.sh
View File

@ -4,9 +4,12 @@ set -Eeuo pipefail
file="/run/dsm.url" file="/run/dsm.url"
active="/run/qemu.pid" active="/run/qemu.pid"
shutdown="/run/qemu.count" shutdown="/run/qemu.count"
url="http://127.0.0.1:2210/read?command=10"
active_msg="QEMU not running yet.." active_msg="QEMU not running yet.."
shutdown_msg="QEMU is shutting down.." shutdown_msg="QEMU is shutting down.."
url="http://127.0.0.1:2210/read?command=10" resp_err="Guest returned an invalid response:"
jq_err="Failed to parse response from guest: jq error"
[ ! -f "$active" ] && echo "$active_msg" && exit 0 [ ! -f "$active" ] && echo "$active_msg" && exit 0
[ -f "$shutdown" ] && echo "$shutdown_msg" && exit 1 [ -f "$shutdown" ] && echo "$shutdown_msg" && exit 1
@ -20,8 +23,8 @@ if [ ! -f "$file" ]; then
(( rc != 0 )) && echo "Failed to connect to guest: curl error $rc" && exit 1 (( rc != 0 )) && echo "Failed to connect to guest: curl error $rc" && exit 1
{ result=$(echo "$json" | jq -r '.status'); rc=$?; } || : { result=$(echo "$json" | jq -r '.status'); rc=$?; } || :
(( rc != 0 )) && echo "Failed to parse response from guest: jq error $rc ( $json )" && exit 1 (( rc != 0 )) && echo "$jq_err $rc ( $json )" && exit 1
[[ "$result" == "null" ]] && echo "Guest returned invalid response: $json" && exit 1 [[ "$result" == "null" ]] && echo "$resp_err $json" && exit 1
if [[ "$result" != "success" ]] ; then if [[ "$result" != "success" ]] ; then
{ msg=$(echo "$json" | jq -r '.message'); rc=$?; } || : { msg=$(echo "$json" | jq -r '.message'); rc=$?; } || :
@ -29,13 +32,13 @@ if [ ! -f "$file" ]; then
fi fi
{ port=$(echo "$json" | jq -r '.data.data.dsm_setting.data.http_port'); rc=$?; } || : { port=$(echo "$json" | jq -r '.data.data.dsm_setting.data.http_port'); rc=$?; } || :
(( rc != 0 )) && echo "Failed to parse response from guest: jq error $rc ( $json )" && exit 1 (( rc != 0 )) && echo "$jq_err $rc ( $json )" && exit 1
[[ "$port" == "null" ]] && echo "Guest has not set a portnumber yet.." && exit 1 [[ "$port" == "null" ]] && echo "$resp_err $json" && exit 1
[ -z "$port" ] && echo "Guest has not set a portnumber yet.." && exit 1 [ -z "$port" ] && echo "Guest has not set a portnumber yet.." && exit 1
{ ip=$(echo "$json" | jq -r '.data.data.ip.data[] | select((.name=="eth0") and has("ip")).ip'); rc=$?; } || : { ip=$(echo "$json" | jq -r '.data.data.ip.data[] | select((.name=="eth0") and has("ip")).ip'); rc=$?; } || :
(( rc != 0 )) && echo "Failed to parse response from guest: jq error $rc ( $json )" && exit 1 (( rc != 0 )) && echo "$jq_err $rc ( $json )" && exit 1
[[ "$ip" == "null" ]] && echo "Guest returned invalid response: $json" && exit 1 [[ "$ip" == "null" ]] && echo "$resp_err $json" && exit 1
[ -z "$ip" ] && echo "Guest has not received an IP yet.." && exit 1 [ -z "$ip" ] && echo "Guest has not received an IP yet.." && exit 1
echo "$ip:$port" > $file echo "$ip:$port" > $file

1
src/install.sh
View File

@ -29,6 +29,7 @@ DL_GLOBAL="https://global.synologydownload.com/download/DSM"
if [ -z "$DL" ]; then if [ -z "$DL" ]; then
[ -z "$COUNTRY" ] && setCountry [ -z "$COUNTRY" ] && setCountry
[ -z "$COUNTRY" ] && info "Warning: could not detect country to select mirror!"
[[ "${COUNTRY^^}" == "CN" ]] && DL="$DL_CHINA" || DL="$DL_GLOBAL" [[ "${COUNTRY^^}" == "CN" ]] && DL="$DL_CHINA" || DL="$DL_GLOBAL"
fi fi

14
src/print.sh
View File

@ -7,6 +7,8 @@ error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: $1" "\E[0m\n" >&2; }
file="/run/dsm.url" file="/run/dsm.url"
shutdown="/run/qemu.count" shutdown="/run/qemu.count"
url="http://127.0.0.1:2210/read?command=10" url="http://127.0.0.1:2210/read?command=10"
resp_err="Guest returned an invalid response:"
jq_err="Failed to parse response from guest: jq error"
while [ ! -f "$file" ] while [ ! -f "$file" ]
do do
@ -28,8 +30,8 @@ do
(( rc != 0 )) && error "Failed to connect to guest: curl error $rc" && continue (( rc != 0 )) && error "Failed to connect to guest: curl error $rc" && continue
{ result=$(echo "$json" | jq -r '.status'); rc=$?; } || : { result=$(echo "$json" | jq -r '.status'); rc=$?; } || :
(( rc != 0 )) && error "Failed to parse response from guest: jq error $rc ( $json )" && continue (( rc != 0 )) && error "$jq_err $rc ( $json )" && continue
[[ "$result" == "null" ]] && error "Guest returned invalid response: $json" && continue [[ "$result" == "null" ]] && error "$resp_err $json" && continue
if [[ "$result" != "success" ]] ; then if [[ "$result" != "success" ]] ; then
{ msg=$(echo "$json" | jq -r '.message'); rc=$?; } || : { msg=$(echo "$json" | jq -r '.message'); rc=$?; } || :
@ -37,13 +39,13 @@ do
fi fi
{ port=$(echo "$json" | jq -r '.data.data.dsm_setting.data.http_port'); rc=$?; } || : { port=$(echo "$json" | jq -r '.data.data.dsm_setting.data.http_port'); rc=$?; } || :
(( rc != 0 )) && error "Failed to parse response from guest: jq error $rc ( $json )" && continue (( rc != 0 )) && error "$jq_err $rc ( $json )" && continue
[[ "$port" == "null" ]] && error "Guest returned invalid response: $json" && continue [[ "$port" == "null" ]] && error "$resp_err $json" && continue
[ -z "$port" ] && continue [ -z "$port" ] && continue
{ ip=$(echo "$json" | jq -r '.data.data.ip.data[] | select((.name=="eth0") and has("ip")).ip'); rc=$?; } || : { ip=$(echo "$json" | jq -r '.data.data.ip.data[] | select((.name=="eth0") and has("ip")).ip'); rc=$?; } || :
(( rc != 0 )) && error "Failed to parse response from guest: jq error $rc ( $json )" && continue (( rc != 0 )) && error "$jq_err $rc ( $json )" && continue
[[ "$ip" == "null" ]] && error "Guest returned invalid response: $json" && continue [[ "$ip" == "null" ]] && error "$resp_err $json" && continue
[ -z "$ip" ] && continue [ -z "$ip" ] && continue
echo "$ip:$port" > $file echo "$ip:$port" > $file