From bf1116e63698e53bf62edd0c7d3f7e796a9a51c9 Mon Sep 17 00:00:00 2001
From: Andrey <rusefillc@gmail.com>
Date: Mon, 14 Oct 2024 14:03:07 -0400
Subject: [PATCH] extracting ubuntu-install-tools.sh

---
 .github/workflows/build-firmware.yaml       | 2 +-
 .github/workflows/build-rusEFI-console.yaml | 2 +-
 .github/workflows/build-simulator.yaml      | 2 +-
 .github/workflows/build-unit-tests.yaml     | 3 ++-
 .github/workflows/codeql-buildscript.sh     | 3 ++-
 firmware/setup_linux_environment.sh         | 3 ++-
 misc/actions/ubuntu-install-tools.sh        | 7 +++++++
 7 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 misc/actions/ubuntu-install-tools.sh

diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
index 63d3b06d9a..e2c6305350 100644
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -191,7 +191,7 @@ jobs:
     - name: Install multilib, mingw, sshpass and mtools
       run: |
         sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
-        sudo apt-get install gcc-multilib g++-multilib g++-mingw-w64 gcc-mingw-w64 sshpass mtools zip dosfstools
+        sudo bash misc/actions/ubuntu-install-tools.sh
 
     - name: Set Build Env Variables
       working-directory: ./firmware/
diff --git a/.github/workflows/build-rusEFI-console.yaml b/.github/workflows/build-rusEFI-console.yaml
index 873d5a0f21..d7b08248a7 100644
--- a/.github/workflows/build-rusEFI-console.yaml
+++ b/.github/workflows/build-rusEFI-console.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: Install Tools
         run: |
           sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
-          sudo apt-get install sshpass mtools
+          sudo bash misc/actions/ubuntu-install-tools.sh
 
       - name: Build Config Definition Base and Enum to String
         working-directory: ./java_tools/
diff --git a/.github/workflows/build-simulator.yaml b/.github/workflows/build-simulator.yaml
index 295127aa20..8e5f2e11a6 100644
--- a/.github/workflows/build-simulator.yaml
+++ b/.github/workflows/build-simulator.yaml
@@ -22,7 +22,7 @@ jobs:
     - name: Install multilib
       run: |
         sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
-        sudo apt-get install gcc-multilib g++-multilib mtools dosfstools zip
+        sudo bash misc/actions/ubuntu-install-tools.sh
 
     - uses: actions/setup-java@v4
       with:
diff --git a/.github/workflows/build-unit-tests.yaml b/.github/workflows/build-unit-tests.yaml
index 9442445f97..b3b70d555f 100644
--- a/.github/workflows/build-unit-tests.yaml
+++ b/.github/workflows/build-unit-tests.yaml
@@ -30,7 +30,8 @@ jobs:
       if: ${{ matrix.os != 'macos-latest' }}
       run: |
         sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
-        sudo apt-get install mtools zip dosfstools sshpass lcov valgrind
+        sudo bash misc/actions/ubuntu-install-tools.sh
+        sudo apt-get install lcov valgrind
 
     - name: Install required software (macos)
       if: ${{ matrix.os == 'macos-latest' }}
diff --git a/.github/workflows/codeql-buildscript.sh b/.github/workflows/codeql-buildscript.sh
index df9290d25a..adee6310ea 100644
--- a/.github/workflows/codeql-buildscript.sh
+++ b/.github/workflows/codeql-buildscript.sh
@@ -6,7 +6,8 @@
 sudo apt-get update -y
 
 # install dependencies
-sudo apt-get install -y build-essential gcc gdb gcc-multilib g++-multilib make openjdk-11-jdk-headless ant mtools zip xxd libncurses5 libncursesw5
+sudo bash misc/actions/ubuntu-install-tools.sh
+sudo apt-get install -y build-essential gcc gdb gcc-multilib make openjdk-11-jdk-headless xxd libncurses5 libncursesw5
 
 # delete any old tools, create a new folder, and go there
 rm -rf ~/.rusefi-tools
diff --git a/firmware/setup_linux_environment.sh b/firmware/setup_linux_environment.sh
index ff5dd4775d..c35ec9de0b 100755
--- a/firmware/setup_linux_environment.sh
+++ b/firmware/setup_linux_environment.sh
@@ -18,7 +18,8 @@ git submodule update --init
 sudo apt-get update
 
 # install dependencies
-sudo apt-get install -y build-essential gcc gdb gcc-multilib g++-multilib make openjdk-11-jdk-headless mtools zip xxd libncurses5 libncursesw5
+sudo bash misc/actions/ubuntu-install-tools.sh
+sudo apt-get install -y build-essential gcc gdb gcc-multilib make openjdk-11-jdk-headless xxd libncurses5 libncursesw5
 
 # delete any old tools, create a new folder, and go there
 rm -rf ~/.rusefi-tools
diff --git a/misc/actions/ubuntu-install-tools.sh b/misc/actions/ubuntu-install-tools.sh
new file mode 100644
index 0000000000..2c72df9922
--- /dev/null
+++ b/misc/actions/ubuntu-install-tools.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# this script installs tools needed to compile ECU firmware, simulator and unit tests
+#
+# out of scope: JDK, ARM GCC compiler
+
+apt-get install gcc-multilib g++-multilib g++-mingw-w64 gcc-mingw-w64 sshpass mtools zip dosfstools