From fd1a05473af17e0df4c9629ef9e9f81bb344fcd5 Mon Sep 17 00:00:00 2001
From: Maxim Slipenko <no-reply@maxim.slipenko.com>
Date: Tue, 18 Jul 2023 10:49:19 +0300
Subject: [PATCH] update

---
 Dockerfile |  5 ++---
 extra.sh   | 28 +++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 61feda1..e6b53c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,9 +25,8 @@ RUN . /extra.sh && \
         ghcr.io/devcontainers-contrib/features/pipx-package:1 \
             --option package="aqtinstall" \
             --option version="${AQTINSTALL}" && \
-    rm /nanolayer
-
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
+    rm /nanolayer && \
+    switch_gcc_version
 
 RUN /bin/bash -c 'source /etc/profile && \
 aqt install --outputdir /opt/qt ${QT} ${QT_HOST} ${QT_TARGET} ${QT_ARCH} -m ${QT_MODULES}'
diff --git a/extra.sh b/extra.sh
index ac9a90e..2a7ec8e 100644
--- a/extra.sh
+++ b/extra.sh
@@ -1,12 +1,34 @@
 packages_to_install() {
-    echo -n "g++-9,libclang-dev,libgl1-mesa-dev,libxkbcommon-x11-0,libdbus-1-3,libpulse-mainloop-glib0"
-    
+    echo -n "libclang-dev,libgl1-mesa-dev,libxkbcommon-x11-0,libdbus-1-3"
+
     case $QT in 
         5*)
             echo -n ",libpulse-mainloop-glib0"
         ;;
         *)
-            echo ""
+            echo -n ""
         ;;
     esac
+
+    echo -n ",gcc-$(get_g_version),g++$(get_g_version)"
+}
+
+verlte() {
+    printf '%s\n' "$1" "$2" | sort -C -V
+}
+
+verlt() {
+    ! verlte "$2" "$1"
+}
+
+get_g_version() {
+    if verlt $QT "6.5.0"; then
+        echo -n "9"
+    else
+        echo -n "10"
+    fi
+}
+
+switch_gcc_version() {
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-$(get_g_version) 60 --slave /usr/bin/g++ g++ /usr/bin/g++-$(get_g_version)
 }
\ No newline at end of file