Merge pull request #67 from outis1one/claude/zealous-feynman-odDrh
tools: fix null display in fbq-add-source.sh for sources without name…
This commit is contained in:
@@ -220,7 +220,7 @@ cmd_remove() {
|
|||||||
local i=1
|
local i=1
|
||||||
for p in "${paths[@]}"; do
|
for p in "${paths[@]}"; do
|
||||||
local name
|
local name
|
||||||
name=$(yq e ".server.sources[] | select(.path == \"$p\") | .name" "$config" 2>/dev/null || echo "")
|
name=$(yq e ".server.sources[] | select(.path == \"$p\") | .name // \"(unnamed)\"" "$config" 2>/dev/null || echo "(unnamed)")
|
||||||
printf " %2d) %-20s %s\n" "$i" "${name:-?}" "$p"
|
printf " %2d) %-20s %s\n" "$i" "${name:-?}" "$p"
|
||||||
(( i++ ))
|
(( i++ ))
|
||||||
done
|
done
|
||||||
@@ -256,12 +256,12 @@ cmd_show() {
|
|||||||
|
|
||||||
local count=0
|
local count=0
|
||||||
while IFS= read -r p; do
|
while IFS= read -r p; do
|
||||||
local name enabled readonly
|
local name enabled ro
|
||||||
name=$(yq e ".server.sources[] | select(.path == \"$p\") | .name" "$config" 2>/dev/null || echo "?")
|
name=$(yq e ".server.sources[] | select(.path == \"$p\") | .name // \"(unnamed)\"" "$config" 2>/dev/null || echo "?")
|
||||||
enabled=$(yq e ".server.sources[] | select(.path == \"$p\") | .config.defaultEnabled" "$config" 2>/dev/null || echo "false")
|
enabled=$(yq e ".server.sources[] | select(.path == \"$p\") | .config.defaultEnabled // false" "$config" 2>/dev/null || echo "false")
|
||||||
readonly=$(yq e ".server.sources[] | select(.path == \"$p\") | .config.readOnly" "$config" 2>/dev/null || echo "false")
|
ro=$(yq e ".server.sources[] | select(.path == \"$p\") | .config.readOnly // false" "$config" 2>/dev/null || echo "false")
|
||||||
printf " %-20s %-35s defaultEnabled=%-5s readOnly=%s\n" \
|
printf " %-20s %-35s defaultEnabled=%-5s readOnly=%s\n" \
|
||||||
"${name}" "${p}" "${enabled}" "${readonly}"
|
"${name}" "${p}" "${enabled}" "${ro}"
|
||||||
(( count++ ))
|
(( count++ ))
|
||||||
done < <(list_sources "$config")
|
done < <(list_sources "$config")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user