Oppdatering for å støtte nyeste versjon av bluecolor

[einar-bin] / colorscan.sh

diff --git a/colorscan.sh b/colorscan.sh
index c57872af9b11dd3507cd174eed29c8a2aa45a2d8..6386c17ebfca2fe705b89c7af261e084c2a16a30 100755 (executable)
--- a/colorscan.sh
+++ b/colorscan.sh
@@ -1,13 +1,16 @@
 #!/bin/bash
 n=1
 while read scan; do
 #!/bin/bash
 n=1
 while read scan; do

-  if [ "${n}" != 1 ]; then
+  if [[ ! "${scan}" =~ "[\"scan" ]]; then
+    continue
+  fi
+  if [ "${n}" -ne 1 ]; then

     echo ""
   fi
   echo "Scan ${n}:"
     echo ""
   fi
   echo "Scan ${n}:"

-  lab=$(echo "${scan}" | jq -cr '.scan.lab | join(", ")')
-  lch=$(echo "${scan}" | jq -cr '.scan.lch | join(", ")')
-  rgb=$(echo "${scan}" | jq -cr '.scan.rgb | join(", ")')
+  lab=$(echo "${scan}" | jq -cr '.[2].scan.lab | join(", ")')
+  lch=$(echo "${scan}" | jq -cr '.[2].scan.lch | join(", ")')
+  rgb=$(echo "${scan}" | jq -cr '.[2].scan.rgb | join(", ")')

   r=$(echo "${rgb}" | cut -f 1 -d "," | tr -d " ")
   g=$(echo "${rgb}" | cut -f 2 -d "," | tr -d " ")
   b=$(echo "${rgb}" | cut -f 3 -d "," | tr -d " ")
   r=$(echo "${rgb}" | cut -f 1 -d "," | tr -d " ")
   g=$(echo "${rgb}" | cut -f 2 -d "," | tr -d " ")
   b=$(echo "${rgb}" | cut -f 3 -d "," | tr -d " ")


@@ -22,4 +25,4 @@ while read scan; do
   echo "RGB:    ${rgb}"
   echo "HEX:    #${rH}${gH}${bH}"
   ((n++))
   echo "RGB:    ${rgb}"
   echo "HEX:    #${rH}${gH}${bH}"
   ((n++))

-done < <(bluecolor --format json)
+done < <(bluecolor --scan --pipe --format json)