Fix end file

Fix end file

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

.github/workflows/expired.yml

@@ -6,7 +6,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v3
+      - uses: actions/stale@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           exempt-issue-milestones: 'future,alpha,beta,release'

.github/workflows/main.yml

@@ -42,7 +42,7 @@ jobs:
   image:
     name: ${{ matrix.arch_name }}
     needs: base
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:

.github/workflows/shellcheck.yml

@@ -0,0 +1,28 @@
+name: Shellcheck CI
+
+on:
+  push:
+    branches:
+    - '*'
+    paths-ignore:
+      - '**/README.md'
+  pull_request:
+    branches:
+    - '*'
+    paths-ignore:
+      - '**/README.md'
+  workflow_dispatch:
+
+jobs:
+  shellcheck:
+    name: Shellcheck
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run ShellCheck
+      uses: ludeeus/action-shellcheck@master
+      with:
+        severity: error
+        format: gcc
+      env:
+        SHELLCHECK_OPTS: -s bash

Makefile

@@ -50,6 +50,12 @@ endif
 # Tag images with date and Git short hash in addition to revision
 TAG := $(shell date '+%Y%m%d')-$(shell git rev-parse --short HEAD)
 
+# shellcheck executable
+SHELLCHECK := shellcheck
+
+# Defines the level of verification (error, warning, info...)
+SHELLCHECK_SEVERITY_LEVEL := error
+
 #
 # images: This target builds all IMAGES (because it is the first one, it is built by default)
 #
@@ -275,6 +281,11 @@ purge: clean
 # Remove all images with organization (ex dockcross/*)
 	$(DOCKER) images --filter=reference='$(ORG)/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
 
+# Check bash syntax
+bash-check:
+	find . -type f \( -name "*.sh" -o -name "*.bash" \) -print0 | xargs -0 -P"$(shell nproc)" -I{} \
+		$(SHELLCHECK) --check-sourced --color=auto --format=gcc --severity=error --shell=bash --enable=all "{}"
+
 #
 # testing implicit rule
 #

common/common.dockcross

@@ -13,4 +13,4 @@ RUN \
   rm -rf /buildscripts
 
 # Runtime scripts
-COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/
+COPY imagefiles/entrypoint.sh imagefiles/dockcross.sh /dockcross/

imagefiles/dockcross.sh

@@ -6,11 +6,11 @@ DEFAULT_DOCKCROSS_IMAGE=dockcross/base  # DO NOT MOVE THIS LINE (see entrypoint.
 # Helpers
 #
 err() {
-    echo -e >&2 ERROR: $@\\n
+    echo -e >&2 "ERROR: $*\n"
 }
 
 die() {
-    err $@
+    err "$*"
     exit 1
 }
 

tools/builder/cmake.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-source $(dirname "$0")/functions/cmake_fn.sh
-
-cmake_build $@

tools/builder/cmake_all.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
-make -f dockcross-Makefile display_images
-
-source $(dirname "$0")/functions/cmake_fn.sh
-
-for image in $(make -f dockcross-Makefile display_images); do
-    cmake_build $image $@
-done

tools/builder/functions/cmake_fn.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-cmake_build () {
-    local image=$1
-    local build_file=build-${image%:*}
-    shift 1
-    local cmake_arg=$@
-    echo "cmake arg: $cmake_arg"
-
-    echo "Pulling dockcross/$image"
-    docker pull dockcross/$image
-    echo "Make script dockcross-$image"
-    docker run --rm dockcross/$image > ./dockcross-$image
-    chmod +x ./dockcross-$image
-    echo "Build $build_file"
-    ./dockcross-$image cmake -B$build_file -H. -GNinja $cmake_arg
-    ./dockcross-$image ninja -C$build_file
-}

tools/builder/functions/makefile_fn.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-makefile_build () {
-    local image=$1
-    shift 1
-
-    echo "Pulling dockcross/$image"
-    docker pull dockcross/$image
-    echo "Make script dockcross-$image"
-    docker run --rm dockcross/$image > ./dockcross-$image
-    chmod +x ./dockcross-$image
-    echo "Build..."
-    ./dockcross-$image bash -c 'make CXX=$CXX CC=$CC AR=$AR AS=$AS CPP=$CPP FC=$FC'
-}

tools/builder/makefile.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-source $(dirname "$0")/functions/makefile_fn.sh
-
-makefile_build $@

tools/builder/makefile_all.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
-make -f dockcross-Makefile display_images
-
-source $(dirname "$0")/functions/makefile_fn.sh
-
-for image in $(make -f dockcross-Makefile display_images); do
-    makefile_build $image $@
-done