rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update yq, fix bug in pinout generation (#4977) 

* update yq

* multiply backslashes so they don't get swallowed
This commit is contained in:
David Holdeman 2023-01-17 22:08:41 -06:00 committed by GitHub
parent 1747d2a0da
commit 0add69e5f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/actions/pinouts-create.sh
View File

@ -33,9 +33,9 @@ for c in $CONNECTORS; do
# todo fail once all pages are compliant exit 1 # todo fail once all pages are compliant exit 1
fi fi
if [ -f $DIR/index.html ]; then 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 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 fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "${I_AM} something is broken" echo "${I_AM} something is broken"

2
misc/actions/pinouts-install.sh
View File

@ -2,7 +2,7 @@
sudo apt-get update sudo apt-get update
sudo apt-get install sshpass 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 chmod a+x yq_linux_amd64
rm -rf yqdir rm -rf yqdir
mkdir yqdir mkdir yqdir

3
misc/pinout-gen/gen.sh
View File

@ -1,7 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P)"/" 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 if [ $? -ne 0 ]; then
echo "Error in gen.sh" echo "Error in gen.sh"
exit 1; exit 1;