Update yq, fix bug in pinout generation (#4977)
* update yq
* multiply backslashes so they don't get swallowed
(cherry picked from commit 0add69e5f0
)
This commit is contained in:
parent
5368f60b22
commit
1655688ff2
|
@ -33,9 +33,9 @@ for c in $CONNECTORS; do
|
|||
# todo fail once all pages are compliant exit 1
|
||||
fi
|
||||
if [ -f $DIR/index.html ]; then
|
||||
bash misc/pinout-gen/append.sh "$(yqdir/yq -j e $c)" $DIR/index.html
|
||||
bash misc/pinout-gen/append.sh "$(yqdir/yq -o=json e $c)" $DIR/index.html
|
||||
else
|
||||
bash misc/pinout-gen/gen.sh "$(yqdir/yq -j e $c)" $DIR/index.html
|
||||
bash misc/pinout-gen/gen.sh "$(yqdir/yq -o=json e $c)" $DIR/index.html
|
||||
fi
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "${I_AM} something is broken"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
sudo apt-get update
|
||||
sudo apt-get install sshpass
|
||||
wget https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_linux_amd64
|
||||
wget https://github.com/mikefarah/yq/releases/download/v4.30.8/yq_linux_amd64
|
||||
chmod a+x yq_linux_amd64
|
||||
rm -rf yqdir
|
||||
mkdir yqdir
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P)"/"
|
||||
TEXT=$(sed -e "/###CSS###/{r ${DIR}style.css" -e 'd}' -e "/###JS###/{r ${DIR}script.js" -e 'd}' ${DIR}pinout.html | sed -e "s/\/\/\/DATA\/\/\//\`$(echo ${1//\//\\/} | tr -d '\n')\`,\n\/\/\/DATA\/\/\//")
|
||||
JSON="$(echo $1 | sed 's/\\/\\\\\\\\/g')"
|
||||
TEXT=$(sed -e "/###CSS###/{r ${DIR}style.css" -e 'd}' -e "/###JS###/{r ${DIR}script.js" -e 'd}' ${DIR}pinout.html | sed -e "s/\/\/\/DATA\/\/\//\`$(echo ${JSON//\//\\/} | tr -d '\n')\`,\n\/\/\/DATA\/\/\//")
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Error in gen.sh"
|
||||
exit 1;
|
||||
|
|
Loading…
Reference in New Issue