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

@@ -10,31 +10,31 @@ on:
 
 jobs:
   flawfinder:
-    runs-on: ubuntu-latest
+      runs-on: ubuntu-latest
-    name: Flawfinder
+      name: Flawfinder
 
-    steps:
+      steps:
-      # step 1
+        # step 1
-      - name: clone application source code
+        - name: clone application source code
-        uses: actions/checkout@v3
+          uses: actions/checkout@v3
 
-      # step 2
+        # step 2
-      - name: flawfinder_scan
+        - name: flawfinder_scan
-        uses: david-a-wheeler/flawfinder@2.0.19
+          uses: david-a-wheeler/flawfinder@2.0.19
-        with:
+          with:
-          arguments: "--sarif ./"
+            arguments: '--sarif ./'
-          output: "flawfinder_report.sarif"
+            output: 'flawfinder_report.sarif'
 
-      # step 3
+        # step 3
-      - name: save report as pipeline artifact
+        - name: save report as pipeline artifact
-        uses: actions/upload-artifact@v3
+          uses: actions/upload-artifact@v3
-        with:
+          with:
-          name: flawfinder_report.sarif
+            name: flawfinder_report.sarif
-          path: flawfinder_report.sarif
+            path: flawfinder_report.sarif
 
-      # step 4
+        # step 4
-      - name: publish code scanning alerts
+        - name: publish code scanning alerts
-        uses: github/codeql-action/upload-sarif@v2
+          uses: github/codeql-action/upload-sarif@v2
-        with:
+          with:
-          sarif_file: flawfinder_report.sarif
+            sarif_file: flawfinder_report.sarif
-          category: flawfinder
+            category: flawfinder

.github/workflows/sec_sast_semgrep_cron.yml

@@ -6,37 +6,39 @@ on:
     branches:
       - master
   schedule:
-    - cron: "0 1 * * 6"
+    - cron:  '0 1 * * 6'
 
 jobs:
+
   semgrep-full:
-    runs-on: ubuntu-latest
+      runs-on: ubuntu-latest
-    container:
+      container:
-      image: returntocorp/semgrep
+        image: returntocorp/semgrep
 
-    steps:
+      steps:
-      # step 1
-      - name: clone application source code
-        uses: actions/checkout@v3
 
-      # step 2
+        # step 1
-      - name: full scan
+        - name: clone application source code
-        run: |
+          uses: actions/checkout@v3
-          semgrep \
-            --sarif --output report.sarif \
-            --metrics=off \
-            --config="p/default"
 
-      # step 3
+        # step 2
-      - name: save report as pipeline artifact
+        - name: full scan
-        uses: actions/upload-artifact@v3
+          run: |
-        with:
+            semgrep \
-          name: report.sarif
+              --sarif --output report.sarif \
-          path: report.sarif
+              --metrics=off \
+              --config="p/default"
 
-      # step 4
+        # step 3
-      - name: publish code scanning alerts
+        - name: save report as pipeline artifact
-        uses: github/codeql-action/upload-sarif@v2
+          uses: actions/upload-artifact@v3
-        with:
+          with:
-          sarif_file: report.sarif
+            name: report.sarif
-          category: semgrep
+            path: report.sarif
+
+        # step 4
+        - name: publish code scanning alerts
+          uses: github/codeql-action/upload-sarif@v2
+          with:
+            sarif_file: report.sarif
+            category: semgrep

.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,23 +4,23 @@
 
 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
 
 if [[ $# -gt 0 ]]; then
-	# can override which environment by passing arg
+    # can override which environment by passing arg
-	BOARDS="$@"
+    BOARDS="$@"
 else
-	BOARDS="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 rak4631 rak4631_eink rak11200 t-echo pca10059_diy_eink"
+    BOARDS="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 rak4631 rak4631_eink rak11200 t-echo pca10059_diy_eink"
 fi
 
 echo "BOARDS:${BOARDS}"
 
 CHECK=""
 for BOARD in $BOARDS; do
-	CHECK="${CHECK} -e ${BOARD}"
+     CHECK="${CHECK} -e ${BOARD}"
 done
 
 pio check --flags "-DAPP_VERSION=${APP_VERSION} --suppressions-list=suppressions.txt" $CHECK --skip-packages --pattern="src/" --fail-on-defect=low --fail-on-defect=medium --fail-on-defect=high

bin/check-dependencies.sh

@@ -5,17 +5,17 @@
 set -e
 
 if [[ $# -gt 0 ]]; then
-	# can override which environment by passing arg
+    # can override which environment by passing arg
-	BOARDS="$@"
+    BOARDS="$@"
 else
-	BOARDS="rak4631 rak4631_eink t-echo pca10059_diy_eink pico rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1 station-g1 m5stack-core m5stack-coreink tbeam-s3-core"
+    BOARDS="rak4631 rak4631_eink t-echo pca10059_diy_eink pico rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1 station-g1 m5stack-core m5stack-coreink tbeam-s3-core"
 fi
 
 echo "BOARDS:${BOARDS}"
 
 CHECK=""
 for BOARD in $BOARDS; do
-	CHECK="${CHECK} -e ${BOARD}"
+     CHECK="${CHECK} -e ${BOARD}"
 done
 
 echo $CHECK

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,41 +18,39 @@ Flash image file to device, but first erasing and writing system information"
 EOF
 }
 
+
 while getopts ":hp:P:f:" opt; do
-	case "${opt}" in
+    case "${opt}" in
-	h)
+        h)
-		show_help
+            show_help
-		exit 0
+            exit 0
-		;;
+            ;;
-	p)
+        p)  export ESPTOOL_PORT=${OPTARG}
-		export ESPTOOL_PORT=${OPTARG}
+	    ;;
-		;;
+        P)  PYTHON=${OPTARG}
-	P)
+            ;;
-		PYTHON=${OPTARG}
+        f)  FILENAME=${OPTARG}
-		;;
+            ;;
-	f)
+        *)
-		FILENAME=${OPTARG}
+ 	    echo "Invalid flag."
-		;;
+            show_help >&2
-	*)
+            exit 1
-		echo "Invalid flag."
+            ;;
-		show_help >&2
+    esac
-		exit 1
-		;;
-	esac
 done
-shift "$((OPTIND - 1))"
+shift "$((OPTIND-1))"
 
 [ -z "$FILENAME" -a -n "$1" ] && {
-	FILENAME=$1
+    FILENAME=$1
-	shift
+    shift
 }
 
 if [ -f "${FILENAME}" ] && [ ! -z "${FILENAME##*"update"*}" ]; then
 	echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
-	"$PYTHON" -m esptool erase_flash
+	"$PYTHON" -m esptool  erase_flash
-	"$PYTHON" -m esptool write_flash 0x00 ${FILENAME}
+	"$PYTHON" -m esptool  write_flash 0x00 ${FILENAME}
-	"$PYTHON" -m esptool write_flash 0x260000 bleota.bin
+    "$PYTHON" -m esptool  write_flash 0x260000 bleota.bin
-	"$PYTHON" -m esptool write_flash 0x300000 littlefs-*.bin
+	"$PYTHON" -m esptool  write_flash 0x300000 littlefs-*.bin
 
 else
 	show_help

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,33 +16,31 @@ Flash image file to device, leave existing system intact."
 EOF
 }
 
+
 while getopts ":hp:P:f:" opt; do
-	case "${opt}" in
+    case "${opt}" in
-	h)
+        h)
-		show_help
+            show_help
-		exit 0
+            exit 0
-		;;
+            ;;
-	p)
+        p)  export ESPTOOL_PORT=${OPTARG}
-		export ESPTOOL_PORT=${OPTARG}
+	    ;;
-		;;
+        P)  PYTHON=${OPTARG}
-	P)
+            ;;
-		PYTHON=${OPTARG}
+        f)  FILENAME=${OPTARG}
-		;;
+            ;;
-	f)
+        *)
-		FILENAME=${OPTARG}
+ 	    echo "Invalid flag."
-		;;
+            show_help >&2
-	*)
+            exit 1
-		echo "Invalid flag."
+            ;;
-		show_help >&2
+    esac
-		exit 1
-		;;
-	esac
 done
-shift "$((OPTIND - 1))"
+shift "$((OPTIND-1))"
 
 [ -z "$FILENAME" -a -n "$1" ] && {
-	FILENAME=$1
+    FILENAME=$1
-	shift
+    shift
 }
 
 if [ -f "${FILENAME}" ] && [ -z "${FILENAME##*"update"*}" ]; then

bin/dump-ram-users.sh

@@ -2,4 +2,4 @@
 
 arm-none-eabi-readelf -s -e .pio/build/nrf52dk/firmware.elf | head -80
 
-nm -CSr --size-sort .pio/build/nrf52dk/firmware.elf | grep '^200'
+nm -CSr --size-sort .pio/build/nrf52dk/firmware.elf  | grep '^200'

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()'
+