dasharo/dts-scripts
0
0
Fork 0
mirror of https://github.com/Dasharo/dts-scripts.git synced 2026-06-13 19:16:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

dts-functions: parse_config: move error printing to function

Browse Source 
To remove unnecessary code duplication

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
This commit is contained in:
Michał Iwanicki
2025-09-03 17:14:53 +02:00
parent aacac5f87c
commit 9508e07ece
1 changed files with 8 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dts-functions.sh
+8 -33
View File
@@ -313,16 +313,7 @@ board_config() {
fi
;;
"NV4xPZ")
parse_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"
result=$?
if [ $result -eq 1 ]; then
print_error "Vendor $VENDOR is currently not supported!"
return 1
elif [ $result -eq 2 ]; then
print_error "System model $SYSTEM_MODEL is currently not supported!"
return 1
elif [ $result -eq 3 ]; then
print_error "Board model $BOARD_MODEL is currently now supported"
if ! parse_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
return 1
fi
@@ -622,16 +613,7 @@ board_config() {
esac
;;
"PC Engines")
parse_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"
result=$?
if [ $result -eq 1 ]; then
print_error "Vendor $VENDOR is currently not supported!"
return 1
elif [ $result -eq 2 ]; then
print_error "System model $SYSTEM_MODEL is currently not supported!"
return 1
elif [ $result -eq 3 ]; then
print_error "Board model $BOARD_MODEL is currently now supported"
if ! parse_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
return 1
fi
@@ -641,16 +623,7 @@ board_config() {
"HARDKERNEL")
case "$SYSTEM_MODEL" in
"ODROID-H4")
parse_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"
result=$?
if [ $result -eq 1 ]; then
print_error "Vendor $VENDOR is currently not supported!"
return 1
elif [ $result -eq 2 ]; then
print_error "System model $SYSTEM_MODEL is currently not supported!"
return 1
elif [ $result -eq 3 ]; then
print_error "Board model $BOARD_MODEL is currently now supported"
if ! parse_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
return 1
fi
;;
@@ -1922,6 +1895,7 @@ parse_config() {
# shellcheck disable=SC2046
output=$(jq -r 'to_entries[] | select(.key != "models") | "\(.key | ascii_upcase)=\"\(.value|tostring)\""' $json_file 2>>"$ERR_LOG_FILE")
if [ -z "$output" ]; then
print_error "Vendor $vendor is currently not supported!"
return 1
fi
eval "$output"
@@ -1944,7 +1918,8 @@ parse_config() {
| "\(.key | ascii_upcase)=\"\(.value|tostring)\""
' $json_file 2>>"$ERR_LOG_FILE")
if [ -z "$output" ]; then
return 2
print_error "System model $system_model is currently not supported!"
return 1
fi
eval "$output"
@@ -1968,10 +1943,10 @@ parse_config() {
| "\(.key | ascii_upcase)=\"\(.value|tostring)\""
' $json_file 2>>"$ERR_LOG_FILE")
if [ -z "$output" ]; then
return 3
print_error "Board model $board_model is currently not supported"
return 1
fi
eval "$output"
fi
return 0
}