Back out changes to non-source files

.github/actions/setup-base/action.yml

@@ -1,5 +1,5 @@
-name: "Setup Build Base Composite Action"
+name: 'Setup Build Base Composite Action'
-description: "Base build actions for Meshtastic Platform IO steps"
+description: 'Base build actions for Meshtastic Platform IO steps'
 
 runs:
   using: "composite"

.github/workflows/sec_sast_flawfinder.yml

@@ -22,8 +22,8 @@ jobs:
         - name: flawfinder_scan
           uses: david-a-wheeler/flawfinder@2.0.19
           with:
-          arguments: "--sarif ./"
+            arguments: '--sarif ./'
-          output: "flawfinder_report.sarif"
+            output: 'flawfinder_report.sarif'
 
         # step 3
         - name: save report as pipeline artifact

.github/workflows/sec_sast_semgrep_cron.yml

@@ -6,15 +6,17 @@ on:
     branches:
       - master
   schedule:
-    - cron: "0 1 * * 6"
+    - cron:  '0 1 * * 6'
 
 jobs:
+
   semgrep-full:
       runs-on: ubuntu-latest
       container:
         image: returntocorp/semgrep
 
       steps:
+
         # step 1
         - name: clone application source code
           uses: actions/checkout@v3

.github/workflows/sec_sast_semgrep_pull.yml

@@ -1,14 +1,17 @@
 ---
 name: Semgrep Differential Scan
-on: pull_request
+on:
+  pull_request
 
 jobs:
+
   semgrep-diff:
     runs-on: ubuntu-latest
     container:
       image: returntocorp/semgrep
 
     steps:
+
       # step 1
       - name: clone application source code
         uses: actions/checkout@v3

.trunk/trunk.yaml

@@ -8,16 +8,17 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
+    - git-diff-check
+    - gitleaks@8.15.2
+    - clang-format@14.0.0
+    - prettier@2.8.3
+  disabled:
     - shellcheck@0.9.0
     - shfmt@3.5.0
     - oxipng@8.0.0
     - actionlint@1.6.22
-    - git-diff-check
-    - gitleaks@8.15.2
     - markdownlint@0.33.0
     - hadolint@2.12.0
-    - clang-format@14.0.0
-    - prettier@2.8.3
     - svgo@3.0.2
 runtimes:
   enabled:

bin/build-esp32.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-VERSION=$(bin/buildinfo.py long)
+VERSION=`bin/buildinfo.py long`
-SHORT_VERSION=$(bin/buildinfo.py short)
+SHORT_VERSION=`bin/buildinfo.py short`
 
 OUTDIR=release/
 

bin/build-native.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-VERSION=$(bin/buildinfo.py long)
+VERSION=`bin/buildinfo.py long`
-SHORT_VERSION=$(bin/buildinfo.py short)
+SHORT_VERSION=`bin/buildinfo.py short`
 
 OUTDIR=release/
 
@@ -20,3 +20,4 @@ cp .pio/build/native/program $OUTDIR/meshtasticd_linux_amd64
 
 cp bin/device-install.* $OUTDIR
 cp bin/device-update.* $OUTDIR
+

bin/build-nrf52.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-VERSION=$(bin/buildinfo.py long)
+VERSION=`bin/buildinfo.py long`
-SHORT_VERSION=$(bin/buildinfo.py short)
+SHORT_VERSION=`bin/buildinfo.py short`
 
 OUTDIR=release/
 

bin/build-rpi2040.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-VERSION=$(bin/buildinfo.py long)
+VERSION=`bin/buildinfo.py long`
-SHORT_VERSION=$(bin/buildinfo.py short)
+SHORT_VERSION=`bin/buildinfo.py short`
 
 OUTDIR=release/
 

bin/check-all.sh

@@ -4,7 +4,7 @@
 
 set -e
 
-VERSION=$(bin/buildinfo.py long)
+VERSION=`bin/buildinfo.py long`
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION

bin/device-install.sh

@@ -1,12 +1,12 @@
 #!/bin/sh
 
-PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
+PYTHON=${PYTHON:-$(which python3 python|head -n 1)}
 
 set -e
 
 # Usage info
 show_help() {
-	cat <<EOF
+cat << EOF
 Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME]
 Flash image file to device, but first erasing and writing system information"
 
@@ -18,20 +18,18 @@ Flash image file to device, but first erasing and writing system information"
 EOF
 }
 
+
 while getopts ":hp:P:f:" opt; do
     case "${opt}" in
         h)
             show_help
             exit 0
             ;;
-	p)
+        p)  export ESPTOOL_PORT=${OPTARG}
-		export ESPTOOL_PORT=${OPTARG}
 	    ;;
-	P)
+        P)  PYTHON=${OPTARG}
-		PYTHON=${OPTARG}
             ;;
-	f)
+        f)  FILENAME=${OPTARG}
-		FILENAME=${OPTARG}
             ;;
         *)
  	    echo "Invalid flag."
@@ -40,7 +38,7 @@ while getopts ":hp:P:f:" opt; do
             ;;
     esac
 done
-shift "$((OPTIND - 1))"
+shift "$((OPTIND-1))"
 
 [ -z "$FILENAME" -a -n "$1" ] && {
     FILENAME=$1

bin/device-update.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
+PYTHON=${PYTHON:-$(which python3 python|head -n 1)}
 
 # Usage info
 show_help() {
-	cat <<EOF
+cat << EOF
 Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME]
 Flash image file to device, leave existing system intact."
 
@@ -16,20 +16,18 @@ Flash image file to device, leave existing system intact."
 EOF
 }
 
+
 while getopts ":hp:P:f:" opt; do
     case "${opt}" in
         h)
             show_help
             exit 0
             ;;
-	p)
+        p)  export ESPTOOL_PORT=${OPTARG}
-		export ESPTOOL_PORT=${OPTARG}
 	    ;;
-	P)
+        P)  PYTHON=${OPTARG}
-		PYTHON=${OPTARG}
             ;;
-	f)
+        f)  FILENAME=${OPTARG}
-		FILENAME=${OPTARG}
             ;;
         *)
  	    echo "Invalid flag."
@@ -38,7 +36,7 @@ while getopts ":hp:P:f:" opt; do
             ;;
     esac
 done
-shift "$((OPTIND - 1))"
+shift "$((OPTIND-1))"
 
 [ -z "$FILENAME" -a -n "$1" ] && {
     FILENAME=$1

bin/promote-release.sh

@@ -4,7 +4,7 @@ set -e
 
 echo "This script is only for developers who are publishing new builds on github.  Most users don't need it"
 
-VERSION=$(bin/buildinfo.py long)
+VERSION=`bin/buildinfo.py long`
 
 # Must have a V prefix to trigger github
 git tag "v${VERSION}"

bin/test-simulator.sh

@@ -8,3 +8,4 @@ sleep 20 # 5 seconds was not enough
 
 echo "Simulator started, launching python test..."
 python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
+