particle-os/particle-os-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Assure that get_json_array outputs compact json output

Browse source 
This fixes the issue with `files` module, where brackets are included in an array.
This commit is contained in:
fiftydinar 2024-12-01 14:02:22 +01:00 • committed by Gerald Pinder
parent 1671ea2143
commit 1cc8b69e4a
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
scripts/exports.sh
View file

@ -6,16 +6,16 @@
# 2. jq query
# 3. Module config content
get_yaml_array() {
local -n arr=$1
local jq_query=$2
local module_config=$3
local -n arr="${1}"
local jq_query="${2}"
local module_config="${3}"
if [[ -z $jq_query || -z $module_config ]]; then
if [[ -z "${jq_query}" || -z "${module_config}" ]]; then
echo "Usage: get_yaml_array VARIABLE_TO_STORE_RESULTS JQ_QUERY MODULE_CONFIG" >&2
return 1
fi
readarray -t arr < <(echo "$module_config" | yq -I=0 "$jq_query")
readarray -t arr < <(echo "${module_config}" | yq -I=0 "${jq_query}")
}
# Function to retrieve module configs and populate an array
@ -24,28 +24,28 @@ get_yaml_array() {
# 2. jq query
# 3. Module config content
get_json_array() {
local -n arr=$1
local jq_query=$2
local module_config=$3
local -n arr="${1}"
local jq_query="${2}"
local module_config="${3}"
if [[ -z $jq_query || -z $module_config ]]; then
if [[ -z "${jq_query}" || -z "${module_config}" ]]; then
echo "Usage: get_json_array VARIABLE_TO_STORE_RESULTS JQ_QUERY MODULE_CONFIG" >&2
return 1
fi
readarray -t arr < <(echo "$module_config" | jq -r "$jq_query")
readarray -t arr < <(echo "${module_config}" | jq -c -r "${jq_query}")
}
color_string() {
local string="$1"
local color_code="$2"
local string="${1}"
local color_code="${2}"
local reset_code="\033[0m"
# ANSI color codes: https://en.wikipedia.org/wiki/ANSI_escape_code#Colors
# Example color codes: 31=red, 32=green, 33=yellow, 34=blue, 35=magenta, 36=cyan, 37=white
# Check if color code is provided, otherwise default to white (37)
if [[ -z "$color_code" ]]; then
if [[ -z "${color_code}" ]]; then
color_code="37"
fi
@ -58,13 +58,13 @@ color_string() {
echo -e "\033[${color_code}m${string}${reset_code}"
else
# Output is not a TTY: Do not apply color codes
echo "$string"
echo "${string}"
fi
}
# Parse OS version and export it
export OS_VERSION=$(grep -Po "(?<=VERSION_ID=)\d+" /usr/lib/os-release)
export OS_ARCH=$(uname -m)
export OS_VERSION="$(grep -Po "(?<=VERSION_ID=)\d+" /usr/lib/os-release)"
export OS_ARCH="$(uname -m)"
# Export functions for use in sub-shells or sourced scripts
export -f get_yaml_array