Merge pull request #112 from christian1980nrw/dev

merge @CKSoft latest changes
christian1980nrw · Oct 23, 2023 · d438b92 · d438b92
2 parents ace2129 + 516ab29
commit d438b92
Show file tree

Hide file tree

Showing 3 changed files with 200 additions and 147 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install yamllint
         run: sudo apt-get install yamllint
       - name: Yamllint all YAML files
@@ -22,7 +22,7 @@ jobs:
       options: --cpus 1
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Check for dockerenv file
         run: |
           (ls /.dockerenv && echo Found dockerenv) || (echo No dockerenv)
@@ -32,26 +32,52 @@ jobs:
       - name: Lint all shell scripts
         run: |
           # https://github.com/koalaman/shellcheck/blob/master/shellcheck.1.md
-          # ... (der restliche Teil bleibt unverändert)
+          if ! shellcheck \
+             victron-venus-os-install.sh scripts/controller.sh scripts/run
+          then
+            ret=$?
+            if [ "0" = "$ret" ]; then
+              echo "$ret: All files successfully scanned with no issues."
+              echo "   Well done, just maybe the return code is not processed properly?!"
+            elif [ "1" = "$ret" ]; then
+              echo "1: All files successfully scanned with some issues."
+              echo "   Good enough!"
+            elif [ "2" = "$ret" ]; then
+              echo "2: Some files could not be processed."
+              exit $ret
+            elif [ "3" = "$ret" ]; then
+              echo "3: ShellCheck was invoked with bad syntax."
+              exit $ret
+            elif [ "4" = "$ret" ]; then
+              echo "4: ShellCheck was invoked with bad options."
+              exit $ret
+            else
+              echo "E: SpellCheck exited with unexpected return code '$ret'."
+              exit $ret
+            fi
+          else
+            echo "$ret: All files successfully scanned with no issues."
+            echo "   Well done!"
+          fi
   execute:
     runs-on: ${{ matrix.os }}
+
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Copy sample.config.txt to config.txt
-        run: cp scripts/sample.config.txt scripts/config.txt
+        uses: actions/checkout@v3
       - name: Extend default set of UNIX tools
         run: |
-          if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
+          if [ "ubuntu-latest" = ${{ matrix.os }} ]; then
             sudo apt-get install wget curl dbus sed gawk
           else
             echo "I: Nothing to install for ${{ matrix.os }}"
           fi
       - name: Install
-        run: sudo ./victron-venus-os-install.sh
+        run: ./victron-venus-os-install.sh
         env:
           DEBUG: 1
           DESTDIR: /tmp/testing

diff --git a/.github/workflows/venus.yml b/.github/workflows/venus.yml
@@ -11,11 +11,7 @@ jobs:
       options: --cpus 1
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2  # Version 2
-
-      - name: Copy config sample
-        run: cp scripts/sample.config.txt scripts/config.txt
-
+        uses: actions/checkout@v3
       - name: Check for dockerenv file
         run: (ls /.dockerenv && echo Found dockerenv) || (echo No dockerenv)
       - name: Install more UNIX tools
@@ -43,7 +39,7 @@ jobs:
           else
              echo "[FAIL]"
              pwd
-             find . | head -n 30
+             find . | head -n 30
              exit 1
           fi
         env: