Merge branch 'Mexit:master' into master

Author: Tnctr-altay-24

.github/workflows/build_image.yml

@@ -16,7 +16,10 @@ jobs:
         run: echo "ver=$(git log -1 --pretty=format:"%h")" >> "$GITHUB_ENV"
 
       - name: Linux Release
-        run: git archive --prefix=MultiOS-USB_$ver/ -o MultiOS-USB_linux_$ver.tar.gz $ver
+        run: |
+          git archive --prefix=MultiOS-USB_$ver/ -o MultiOS-USB_linux_$ver.tar $ver
+          tar --delete --wildcards -f MultiOS-USB_linux_$ver.tar '*/docs/README_image' '*/docs/README_uefi' '*/install.bat' '*/install.ps1'
+          gzip MultiOS-USB_linux_$ver.tar
 
       - name: Windows Release
         run: |
@@ -28,21 +31,28 @@ jobs:
           fallocate $tmp_imageName -l $tmp_imageSize
           dev=$(sudo losetup -f -P --show $tmp_imageName)
           echo "YeS" | sudo ./multios-usb.sh -f fat32 $dev
-          mkdir part_data && sudo mount ${dev}p2 part_data
-          (cd part_data && sudo zip -r ../files.zip *)
+          mkdir part_1 part_2
+          sudo mount ${dev}p1 part_1
+          sudo mount ${dev}p2 part_2
+          sudo rm part_2/MultiOS-USB/install.log
+          mv docs/README_uefi INSTALL.txt
+          sudo zip -r MultiOS-USB_uefi_$ver.zip part_1 part_2 INSTALL.txt install.bat install.ps1 README.md -x "part_1/grub/i386-pc/*"
+          (cd part_2 && sudo zip -r ../files.zip *)
+          sudo umount ${dev}p1
           sudo umount ${dev}p2
           sudo dd if=$dev of=$imageName bs=1M count=$imageSize
           sudo sgdisk -d 2 $imageName
           mv docs/README_image README.txt
           sudo zip MultiOS-USB_windows_image_$ver.zip $imageName files.zip README.txt
 
       - name: Generate SHA256SUM
-        run: sha256sum MultiOS-USB_windows_image_*.zip MultiOS-USB_linux_*.tar.gz > sha256sums.txt
+        run: sha256sum MultiOS-USB_windows_image_*.zip MultiOS-USB_uefi_*.zip MultiOS-USB_linux_*.tar.gz > sha256sums.txt
 
       - uses: actions/upload-artifact@v7
         with:
           name: MultiOS-USB_images_${{ env.ver }}
           path: |
             MultiOS-USB_windows_image_*.zip
+            MultiOS-USB_uefi_*.zip
             MultiOS-USB_linux_*.tar.gz
             sha256sums.txt

.github/workflows/release.yml

@@ -14,7 +14,10 @@ jobs:
           fetch-depth: 0
 
       - name: Linux Release
-        run: git archive --prefix=MultiOS-USB_${{ github.ref_name }}/ -o MultiOS-USB_linux_${{ github.ref_name }}.tar.gz ${{ github.ref_name }}
+        run: |
+          git archive --prefix=MultiOS-USB_${{ github.ref_name }}/ -o MultiOS-USB_linux_${{ github.ref_name }}.tar ${{ github.ref_name }}
+          tar --delete --wildcards -f MultiOS-USB_linux_${{ github.ref_name }}.tar '*/docs/README_image' '*/docs/README_uefi' '*/install.bat' '*/install.ps1'
+          gzip MultiOS-USB_linux_${{ github.ref_name }}.tar
 
       - name: Windows Release
         run: |
@@ -26,16 +29,22 @@ jobs:
           fallocate $tmp_imageName -l $tmp_imageSize
           dev=$(sudo losetup -f -P --show $tmp_imageName)
           echo "YeS" | sudo ./multios-usb.sh -f fat32 $dev
-          mkdir part_data && sudo mount ${dev}p2 part_data
-          (cd part_data && sudo zip -r ../files.zip *)
+          mkdir part_1 part_2
+          sudo mount ${dev}p1 part_1
+          sudo mount ${dev}p2 part_2
+          sudo rm part_2/MultiOS-USB/install.log
+          mv docs/README_uefi INSTALL.txt
+          sudo zip -r MultiOS-USB_uefi_${{ github.ref_name }}.zip part_1 part_2 INSTALL.txt install.bat install.ps1 README.md -x "part_1/grub/i386-pc/*"
+          (cd part_2 && sudo zip -r ../files.zip *)
+          sudo umount ${dev}p1
           sudo umount ${dev}p2
           sudo dd if=$dev of=$imageName bs=1M count=$imageSize
           sudo sgdisk -d 2 $imageName
           mv docs/README_image README.txt
           sudo zip MultiOS-USB_windows_image_${{ github.ref_name }}.zip $imageName files.zip README.txt
 
       - name: Generate SHA256SUM
-        run: sha256sum MultiOS-USB_windows_image_*.zip MultiOS-USB_linux_*.tar.gz > sha256sums.txt
+        run: sha256sum MultiOS-USB_windows_image_*.zip MultiOS-USB_uefi_*.zip MultiOS-USB_linux_*.tar.gz > sha256sums.txt
 
       - name: Release
         env:
@@ -52,4 +61,4 @@ jobs:
             --verify-tag \
             --latest \
             --notes-file notes.txt \
-            MultiOS-USB_windows_image_*.zip MultiOS-USB_linux_*.tar.gz sha256sums.txt
+            MultiOS-USB_windows_image_*.zip MultiOS-USB_uefi_*.zip MultiOS-USB_linux_*.tar.gz sha256sums.txt

README.md

@@ -70,7 +70,7 @@ makepkg -si
 
 **From GitHub - Linux console**
 
-Go to [Releases](https://github.com/Mexit/MultiOS-USB/releases), download the latest version and unpack the downloaded archive.
+Go to [Releases](../../releases/latest), download and unpack the downloaded archive.
 
 Check and install the required packages (in most cases they should be installed by default):
 - tar, bzip2, xz
@@ -91,10 +91,13 @@ For example:
 sudo ./multios-usb.sh /dev/sdX
 ```
 
-**From GitHub - image based installation (experimental)**
+**From GitHub - PowerShell installer or manual installation (UEFI only)**
 
-Recommended installation method for Windows. Go to [Releases](https://github.com/Mexit/MultiOS-USB/releases) and download the appropriate file.  
-Installation details can be found [here](docs/README_image) and in the downloaded archive.
+Recommended installation method for Windows. Installation details can be found [here](docs/README_uefi) and in the downloaded [archive](../../releases/latest).
+
+**From GitHub - Windows: image based installation (BIOS + UEFI - experimental)**
+
+Required external tools. Installation details can be found [here](docs/README_image) and in the downloaded [archive](../../releases/latest).
 
 ## First use
 

config/grub.config

@@ -206,10 +206,10 @@ if [ "${grub_platform}" == "efi" ]; then
 	submenu "EFI User Tools -->" {
 		set found=0
 
-		for efifile in /MultiOS-USB/tools/*.efi; do
+		for efifile in /MultiOS-USB/tools_priv/*.efi; do
 			if [ -f "$efifile" ]; then
 				set found=1
-				regexp --set=efiname "/MultiOS-USB/tools/(.*)" "$efifile"
+				regexp --set=efiname "/MultiOS-USB/tools_priv/(.*)" "$efifile"
 
 				menuentry --class=efi "$efiname" "$efifile" {
 					chainloader "${2}"
@@ -218,8 +218,8 @@ if [ "${grub_platform}" == "efi" ]; then
 		done
 
 		if [ "$found" = "0" ]; then
-			menuentry "(!) No .efi files found — place them in /MultiOS-USB/tools/" --class=warning {
-				echo "No EFI files found in /MultiOS-USB/tools/"
+			menuentry "(!) No .efi files found — place them in /MultiOS-USB/tools_priv/" --class=warning {
+				echo "No EFI files found in /MultiOS-USB/tools_priv/"
 				echo "Copy your .efi files to that folder and reboot."
 				sleep 5
 			}

docs/README_image

@@ -10,7 +10,7 @@ Installation steps
 2) Use Windows+R to open Run, type diskmgmt.msc and press Enter
 3) Right click on the unallocated space on your USB and select New Simple Volume
 	- select size: as you wish, maximum?
-	- Filesystem: fat32
+	- Filesystem: exfat
 	- Volume label: MultiOS-USB
 4) Unpack 'files.zip' to the newly created disk
 5) Copy your ISO files, and boot computer from USB

docs/README_uefi

@@ -0,0 +1,31 @@
+Download the UEFI archive and extract it to the disk.
+
+You can perform the installation in one of the following ways:
+
+- Using the attached .bat file — simply double-click it
+
+- Using the included PowerShell installer:
+
+	1. Open PowerShell as Administrator.
+	2. Navigate to the folder where the downloaded file is located:
+
+		cd "C:\Path\To\Folder"
+
+	3. Run the script:
+
+		powershell -ExecutionPolicy Bypass -File .\install.ps1
+
+		or for PowerShell 7:
+
+		pwsh -ExecutionPolicy Bypass -File .\install.ps1
+
+	If prompted by Windows, confirm that you want to run the script.
+
+- Manually create partitions (for advanced users):
+
+	1. Create the partitions (Microsoft basic data) on a GPT-formatted disk (MBR may work, but it has not been tested):
+
+		Partition 1: Name: MultiOS-EFI, File System: FAT, Size: 25 MB, Attribute flags: 0x8000000000000001
+		Partition 2: Name: MultiOS-USB, File System: exFAT, Size: as large as you want
+
+	2. Copy the contents of the attached folders to the corresponding partitions.

install.bat

@@ -0,0 +1,12 @@
+@echo off
+net session >nul 2>&1
+if %errorLevel% == 0 (
+    goto :run
+) else (
+    powershell -Command "Start-Process '%~f0' -Verb RunAs"
+    exit /b
+)
+
+:run
+powershell -ExecutionPolicy Bypass -File "%~dp0install.ps1"
+pause