保险起见把hasInternet直接等于true

.gitignore

@@ -2,3 +2,4 @@
 /*.zip
 /pkg/
 /src/
+IFLOW.md

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "idf.pythonInstallPath": "/opt/homebrew/bin/python3"
+}

1-get-all-alci-gits-v1.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+##################################################################################################################
+# Written to be used on 64 bits computers
+# Author 	: 	Erik Dubois
+# Website 	: 	http://www.erikdubois.be
+##################################################################################################################
+##################################################################################################################
+#
+#   DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK.
+#
+##################################################################################################################
+
+echo "This gets all the existing githubs at once"
+echo "Fill the array with the original folders first"
+
+# use ls -d */ > list to get the list of the created githubs and copy/paste in
+
+directories=(
+tms-calamares-config/
+tms-grub-theme/
+tms-arch-linux-calamares-installer/
+tms-calamares/
+)
+
+count=0
+
+for name in "${directories[@]}"; do
+	count=$[count+1]
+	tput setaf 1;echo "Github "$count;tput sgr0;
+	# if there is no folder then make one
+	git clone http://192.168.10.207:3000/zj/$name
+	echo "#################################################"
+	echo "################  "$(basename `pwd`)" done"
+	echo "#################################################"
+done

PKGBUILD

@@ -4,7 +4,7 @@
 _pkgname="calamares"
 pkgname="$_pkgname"
 pkgver=3.4.2
-pkgrel=2
+pkgrel=1
 pkgdesc="Distribution-independent installer framework"
 url="https://codeberg.org/Calamares/calamares"
 license=("GPL-3.0-or-later")
@@ -28,7 +28,7 @@ makedepends=(
 _pkgsrc="$_pkgname"
 _pkgext="tar.gz"
 source=("calamares.zip")
-sha256sums=('57b3b36d8cf67393ee8e81871106b2f4a5925c120173f92c6d77c8f6003f79d5')
+sha256sums=('9d59a1e630f7ee99b9668b8356f8ab0fe152092ca2d4f01e4c86d79819b414b8')
 
 build() {
   local _skip_modules=(

add_empty_folders.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-# 保存为 add_empty_folders.sh
-
-echo "正在查找并处理空文件夹..."
-
-# 查找所有空文件夹并创建 .gitkeep
-find . -type d -empty | while read dir; do
-    if [ ! -f "$dir/.gitkeep" ]; then
-        touch "$dir/.gitkeep"
-        echo "✅ 已创建: $dir/.gitkeep"
-    fi
-done
-
-echo "处理完成！"

calamares/src/modules/bootloader/main.py

@@ -639,7 +639,12 @@ def run_grub_install(fw_type, partitions, efi_directory, install_hybrid_grub):
                                    "--force"])
     else:
 
-        if libcalamares.globalstorage.value("bootLoader") is None and install_hybrid_grub:
+        libcalamares.utils.debug("run_grub_install------else bios 1")
+        if efi_directory is not None and not install_hybrid_grub:
+            libcalamares.utils.warning(_("Cannot install BIOS bootloader on UEFI installation when install_hybrid_grub is 'False'!"))
+            
+
+        if libcalamares.globalstorage.value("bootLoader") is None:
             efi_install_path = libcalamares.globalstorage.value("efiSystemPartition")
             if efi_install_path is None or efi_install_path == "":
                 efi_install_path = "/boot/efi"
@@ -650,6 +655,7 @@ def run_grub_install(fw_type, partitions, efi_directory, install_hybrid_grub):
                 return
             boot_loader_install_path = "/dev/" + boot_loader_install_path.split("\n")[1]
         else:
+            libcalamares.utils.debug("run_grub_install------else bios 1-1 ")
             boot_loader = libcalamares.globalstorage.value("bootLoader")
             boot_loader_install_path = boot_loader["installPath"]
             libcalamares.utils.debug(f"boot_loader_install_path: {boot_loader_install_path}")
@@ -660,6 +666,7 @@ def run_grub_install(fw_type, partitions, efi_directory, install_hybrid_grub):
         # boot_loader_install_path points to the physical disk to install GRUB
         # to. It should start with "/dev/", and be at least as long as the
         # string "/dev/sda".
+        libcalamares.utils.debug("run_grub_install------else bios 2")
         if not boot_loader_install_path.startswith("/dev/") or len(boot_loader_install_path) < 8:
             raise ValueError(f"boot_loader_install_path contains unexpected value '{boot_loader_install_path}'")
 

calamares/src/modules/welcome/checker/GeneralRequirements.cpp

@@ -124,10 +124,11 @@ GeneralRequirements::checkRequirements()
         hasPower = checkHasPower();
     }
 
-    if ( m_entriesToCheck.contains( "internet" ) )
-    {
-        hasInternet = checkHasInternet();
-    }
+    // if ( m_entriesToCheck.contains( "internet" ) )
+    // {
+    //     hasInternet = checkHasInternet();
+    // }
+    hasInternet = true;
 
     if ( m_entriesToCheck.contains( "root" ) )
     {
@@ -186,14 +187,14 @@ GeneralRequirements::checkRequirements()
                                    hasPower,
                                    required } );
         }
-        else if ( entry == "internet" )
-        {
-            checkEntries.append( { entry,
-                                   [] { return tr( "is connected to the Internet" ); },
-                                   [] { return tr( "The system is not connected to the Internet." ); },
-                                   hasInternet,
-                                   required } );
-        }
+        // else if ( entry == "internet" )
+        // {
+        //     checkEntries.append( { entry,
+        //                            [] { return tr( "is connected to the Internet" ); },
+        //                            [] { return tr( "The system is not connected to the Internet." ); },
+        //                            hasInternet,
+        //                            required } );
+        // }
         else if ( entry == "root" )
         {
             checkEntries.append( { entry,