Formatted sbs

sbs

@@ -43,26 +43,59 @@ for arg in "$@"; do
     --list) set -- "$@" "-l" ;;
     --test) set -- "$@" "-t" ;;
     --verbose) set -- "$@" "-v" ;;
-        *)            set -- "$@" "$arg"
+    *) set -- "$@" "$arg" ;;
     esac
 done
 
 while getopts b:cdef:hj:lnrt:uv opt; do
     case "$opt" in
-        b) find_deps && build "$build_default_dir" "$OPTARG"; exit;;
-        c) find_deps && clean_all; exit;;
+    b)
+        find_deps && build "$build_default_dir" "$OPTARG"
+        exit
+        ;;
+    c)
+        find_deps && clean_all
+        exit
+        ;;
     d) set_debug ;;
-        e) find_deps && lint true; exit;;
-        f) find_deps && flash "$OPTARG"; exit;;
-        h) usage; exit 0;;
+    e)
+        find_deps && lint true
+        exit
+        ;;
+    f)
+        find_deps && flash "$OPTARG"
+        exit
+        ;;
+    h)
+        usage
+        exit 0
+        ;;
     j) set_jobs "$OPTARG" ;;
-        l) find_deps && list; exit;;
-        n) find_deps && lint false; exit;;
-        r) find_deps && boards; exit;;
-        t) find_deps && run_tests "$OPTARG"; exit;;
-        u) find_deps && configure "$build_default_dir"; exit;;
+    l)
+        find_deps && list
+        exit
+        ;;
+    n)
+        find_deps && lint false
+        exit
+        ;;
+    r)
+        find_deps && boards
+        exit
+        ;;
+    t)
+        find_deps && run_tests "$OPTARG"
+        exit
+        ;;
+    u)
+        find_deps && configure "$build_default_dir"
+        exit
+        ;;
     v) set_verbose ;;
-        ?) usage; exit 2;;
+    ?)
+        usage
+        exit 2
+        ;;
     esac
 done
 shift $((OPTIND - 1))

scripts/sbs_implementation

@@ -64,19 +64,34 @@ find_deps() {
     command -v st-flash >/dev/null 2>&1 && found_stflash=true
     command -v ST-LINK_CLI.exe >/dev/null 2>&1 && found_stlink=true
 
-    printf "Found CMake: ";               [ "$found_cmake" = true ]       && echo "yes" || echo "no"
-    printf "Found arm-miosix-eabi-g++: "; [ "$found_miosixgpp" = true ]   && echo "yes" || echo "no"
-    printf "Found Ccache: ";              [ "$found_ccache" = true ]      && echo "yes" || echo "no"
-    printf "Found Ninja: ";               [ "$found_ninja" = true ]       && echo "yes" || echo "no"
-    printf "Found Python: ";              [ "$found_python" = true ]      && echo "yes" || echo "no"
-    printf "Found Cppcheck: ";            [ "$found_cppcheck" = true ]    && echo "yes" || echo "no"
-    printf "Found clang-tidy: ";          [ "$found_clangtidy" = true ]   && echo "yes" || echo "no"
-    printf "Found clang-format: ";        [ "$found_clangformat" = true ] && echo "yes" || echo "no"
-    printf "Found flasher: ";             [ "$found_stflash" = true ]     && echo "st-flash" \
-    || { [ "$found_stlink" = true ] && echo "st-link" || echo "no"; }
-    
-    [ "$found_cmake" = true ]     || { echo "Error: CMake must be installed"; return 1; }
-    [ "$found_miosixgpp" = true ] || { echo "Error: arm-miosix-eabi-g++ must be installed"; return 1; }
+    printf "Found CMake: "
+    [ "$found_cmake" = true ] && echo "yes" || echo "no"
+    printf "Found arm-miosix-eabi-g++: "
+    [ "$found_miosixgpp" = true ] && echo "yes" || echo "no"
+    printf "Found Ccache: "
+    [ "$found_ccache" = true ] && echo "yes" || echo "no"
+    printf "Found Ninja: "
+    [ "$found_ninja" = true ] && echo "yes" || echo "no"
+    printf "Found Python: "
+    [ "$found_python" = true ] && echo "yes" || echo "no"
+    printf "Found Cppcheck: "
+    [ "$found_cppcheck" = true ] && echo "yes" || echo "no"
+    printf "Found clang-tidy: "
+    [ "$found_clangtidy" = true ] && echo "yes" || echo "no"
+    printf "Found clang-format: "
+    [ "$found_clangformat" = true ] && echo "yes" || echo "no"
+    printf "Found flasher: "
+    [ "$found_stflash" = true ] && echo "st-flash" ||
+        { [ "$found_stlink" = true ] && echo "st-link" || echo "no"; }
+
+    [ "$found_cmake" = true ] || {
+        echo "Error: CMake must be installed"
+        return 1
+    }
+    [ "$found_miosixgpp" = true ] || {
+        echo "Error: arm-miosix-eabi-g++ must be installed"
+        return 1
+    }
 }
 
 # Workaround: Disable tests in excluded subdirectories
@@ -92,7 +107,10 @@ configure() {
 
     ohai "Configure"
 
-    [ -f "$toolchain_file" ] || { echo "Error: CMake Toolchain File for Miosix was not found"; return 1; }
+    if ! [[ -f "$toolchain_file" ]]; then
+        echo "Error: CMake Toolchain File for Miosix was not found"
+        return 1
+    fi
 
     declare -a defs=(-DCMAKE_EXPORT_COMPILE_COMMANDS=ON)
     defs+=(-DCMAKE_C_FLAGS=-fdiagnostics-color=always -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always)
@@ -122,8 +140,8 @@ check_configured() {
     else
         [ -f "$build_dir/$DEBUG_FILENAME" ] && found_debug=true || found_debug=false
         [ -f "$build_dir/$VERBOSE_FILENAME" ] && found_verbose=true || found_verbose=false
-        if [ "$config_debug" != "$found_debug" ] \
-        || [ "$config_verbose" != "$found_verbose" ]; then
+        if [ "$config_debug" != "$found_debug" ] ||
+            [ "$config_verbose" != "$found_verbose" ]; then
             to_reconfigure=true
         fi
     fi
@@ -183,7 +201,10 @@ flash() {
 
     ohai "Flash"
 
-    [ -f "$build_dir/$target.bin" ] || { echo "Error: target '$target' is not flashable"; return 1; }
+    if [ -f "$build_dir/$target.bin" ]; then
+        echo "Error: target '$target' is not flashable"
+        return 1
+    fi
 
     if [ "$found_stflash" = true ]; then
         st-flash --reset write "$build_dir/$target.bin" 0x8000000
@@ -206,7 +227,10 @@ run_tests() {
     ohai "Test"
 
     cmake_disable_excluded_tests "$build_dir"
-    ( cd "$build_dir" || return; ctest )
+    (
+        cd "$build_dir" || return
+        ctest
+    )
 }
 
 list() {
@@ -219,8 +243,8 @@ list() {
         echo "[1/1] All SBS targets available:"
     fi
 
-    cmake --build "$build_dir" --target help \
-    | grep -o '^[^/]*\.bin' | cut -f 1 -d '.'
+    cmake --build "$build_dir" --target help |
+        grep -o '^[^/]*\.bin' | cut -f 1 -d '.'
 }
 
 boards() {
@@ -255,11 +279,11 @@ lint_clangtidy() {
 
     ohai "Lint (clang-tidy)"
 
-    defs=(--extra-arg=-D_MIOSIX=1 --extra-arg=-D_MIOSIX_GCC_PATCH_MINOR=1 \
+    defs=(--extra-arg=-D_MIOSIX=1 --extra-arg=-D_MIOSIX_GCC_PATCH_MINOR=1
         --extra-arg=-D_MIOSIX_GCC_PATCH_MAJOR=3 --extra-arg=-D__LINT__)
     IFS=$'\n' read -rd '' -a incs < \
-    <(arm-miosix-eabi-g++ -E -Wp,-v -xc++ /dev/null 2>&1 \
-    | sed -n "s/^ /--extra-arg=-isystem/p")
+        <(arm-miosix-eabi-g++ -E -Wp,-v -xc++ /dev/null 2>&1 |
+            sed -n "s/^ /--extra-arg=-isystem/p")
 
     declare opts=()
     [ "$to_edit" = true ] && opts+=(--fix-notes --fix-errors)