From 88ddf9c27377590ee799f760cfc0d850e781ce58 Mon Sep 17 00:00:00 2001
From: neher-igel <neher@igel.com>
Date: Wed, 3 Apr 2024 13:15:54 -0500
Subject: [PATCH] 1108 and 1109 update

---
 .../build/build-edge-cp.sh                    | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/CP_Source/Browsers/Microsoft_Edge_beta/build/build-edge-cp.sh b/CP_Source/Browsers/Microsoft_Edge_beta/build/build-edge-cp.sh
index 4e478fa2..70b753cd 100755
--- a/CP_Source/Browsers/Microsoft_Edge_beta/build/build-edge-cp.sh
+++ b/CP_Source/Browsers/Microsoft_Edge_beta/build/build-edge-cp.sh
@@ -9,25 +9,35 @@ ZIP_LOC="https://github.com/IGEL-Community/IGEL-Custom-Partitions/raw/master/CP_
 ZIP_FILE="Microsoft_Edge_beta"
 FIX_MIME="TRUE"
 CLEAN="FALSE"
-OS11_CLEAN="11.07.100"
-OS12_CLEAN="12.01.100"
+OS11_CLEAN1108="11.08.440"
+OS11_CLEAN1109="11.09.260"
+OS12_CLEAN="12.3.2"
 USERHOME_FOLDERS="TRUE"
-USERHOME_FOLDERS_DIRS="custom/edge/userhome/.config/microsoft-edge-beta custom/edge/userhome/.local/share/applications"
+USERHOME_FOLDERS_DIRS=("custom/edge/userhome/.config/microsoft-edge-beta" "custom/edge/userhome/.local/share/applications")
 APPARMOR="TRUE"
 GETVERSION_FILE="../../microsoft*.deb"
-MISSING_LIBS_OS11="microsoft-edge-beta libatomic1"
+MISSING_LIBS_OS1108="microsoft-edge-beta libatomic1"
+MISSING_LIBS_OS1109="microsoft-edge-beta libatomic1"
 MISSING_LIBS_OS12="microsoft-edge-beta"
 
 VERSION_ID=$(grep "^VERSION_ID" /etc/os-release | cut -d "\"" -f 2)
 
 if [ "${VERSION_ID}" = "18.04" ]; then
-  MISSING_LIBS="${MISSING_LIBS_OS11}"
+  MISSING_LIBS="${MISSING_LIBS_OS1108}"
   IGELOS_ID="OS11"
+  IGELOS_ID_VER="OS1108"
+  OS11_CLEAN="${OS11_CLEAN1108}"
+elif [ "${VERSION_ID}" = "22.04" ]; then
+  MISSING_LIBS="${MISSING_LIBS_OS1109}"
+  IGELOS_ID="OS11"
+  IGELOS_ID_VER="OS1109"
+  OS11_CLEAN="${OS11_CLEAN1109}"
 elif [ "${VERSION_ID}" = "20.04" ]; then
   MISSING_LIBS="${MISSING_LIBS_OS12}"
   IGELOS_ID="OS12"
+  IGELOS_ID_VER="OS12"
 else
-  echo "Not a valid Ubuntu OS release. OS11 needs 18.04 (bionic) and OS12 needs 20.04 (focal)."
+  echo "Not a valid Ubuntu OS release. pre OS11.09 needs 18.04 (bionic), OS11.09+ needed 22.04 (jammy), and OS12 needs 20.04 (focal)."
   exit 1
 fi
 
@@ -50,13 +60,13 @@ do
   dpkg -x "${LINE}" custom/${CP}
 done
 
-if [ "${FIX_MIME}" = "TRUE" ]; then
+if [ "${FIX_MIME}" = "TRUE" ] && [ "${IGELOS_ID}" = "OS11" ]; then
   mv custom/${CP}/usr/share/applications/ custom/${CP}/usr/share/applications.mime
 fi
 
 if [ "${USERHOME_FOLDERS}" = "TRUE" ]; then
-  for folder in $USERHOME_FOLDERS_DIRS; do
-    mkdir -p $folder
+  for folder in "${USERHOME_FOLDERS_DIRS[@]}"; do
+    mkdir -p "$folder"
   done
   touch custom/edge/userhome/.local/share/applications/mimeapps.list
 fi
@@ -107,7 +117,7 @@ sed -i "/^version=/c version=\"${VERSION}\"" target/${CP}.inf
 tar cvjf target/${CP}.tar.bz2 ${CP} ${CP}-cp-init-script.sh
 zip -g ../${ZIP_FILE}.zip target/${CP}.tar.bz2 target/${CP}.inf
 zip -d ../${ZIP_FILE}.zip "target/build/*" "target/igel/*" "target/target/*"
-mv ../${ZIP_FILE}.zip ../../${ZIP_FILE}-${VERSION}_${IGELOS_ID}_igel01.zip
+mv ../${ZIP_FILE}.zip ../../${ZIP_FILE}-${VERSION}_${IGELOS_ID_VER}_igel01.zip
 
 cd ../..
 rm -rf build_tar