FIx Issues With Missing Files

Author: MustardChef

.gitattributes

@@ -1,8 +1,10 @@
-*.py text eol=lf
-*.sh text eol=lf
-*.exe binary
-*.apk binary
-*.so binary
-*.xml text eol=crlf
+* text eol=lf merge=theirs
+
 *.bat text eol=crlf
 *.ps1 text eol=crlf
+
+*.exe binary
+*.dll binary
+*.erofs binary
+linker64 binary
+*.so binary

bin/EROFS/fuse.erofs

@@ -49,16 +49,19 @@ Function Test-CommandExist {
 
 function Finish {
     Clear-Host
-    Remove-Item -Force .\disk.txt
     Write-Output "Optimizing VHDX size..."
+    $i = 0
     foreach ($Partition in "system","product","system_ext","vendor") {
+        Remove-Item -Force "$Partition.txt" -ErrorAction SilentlyContinue
         Write-Output "SELECT VDISK FILE=`"$PSScriptRoot\$Partition.vhdx`"`
-        ATTACH VDISK READONLY`
-        COMPACT VDISK`
-        DETACH VDISK" | Add-Content -Path "$Partition.txt" -Encoding UTF8
+ATTACH VDISK READONLY`
+COMPACT VDISK`
+DETACH VDISK" | Add-Content -Path "$Partition.txt" -Encoding UTF8
+        ++$i
+        Write-Progress -Activity "Compacting VHDX : $Partition.vhdx" -PercentComplete ($i / 4 * 100)
+        Start-Process -NoNewWindow -Wait "diskpart.exe" -Args "/s $Partition.txt" -RedirectStandardOutput NUL
+        Remove-Item -Force "$Partition.txt"
     }
-    Start-Process -NoNewWindow -Wait "diskpart.exe" -Args "/s disk.txt" -RedirectStandardOutput NUL
-    Remove-Item -Force .\disk.txt
     Clear-Host
     Start-Process "shell:AppsFolder\MicrosoftCorporationII.WindowsSubsystemForAndroid_8wekyb3d8bbwe!SettingsApp"
     Start-Process "wsa://com.topjohnwu.magisk"

bin/EROFS/mkfs.erofs

@@ -22,36 +22,30 @@ If (((Test-Path -Path $(Get-Content -Path .\filelist-pri.txt)) -Eq $false).Count
     $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
     exit 1
 } Else {
-    $AppxManifestFile = ".\AppxManifest.xml"
+    New-Item -Path "." -Name "priinfo" -ItemType "directory" | Out-Null
     Copy-Item .\resources.pri -Destination ".\pri\resources.pri" | Out-Null
-    $ProcNew = Start-Process -PassThru makepri.exe -NoNewWindow -Args "new /pr .\pri /cf .\xml\priconfig.xml /of .\resources.pri /mn $AppxManifestFile /o"
-    $null = $ProcNew.Handle
-    $ProcNew.WaitForExit()
-    If ($ProcNew.ExitCode -Ne 0) {
-        Write-Warning "Failed to merge resources from pris`r`nTrying to dump pris to priinfo...."
-        New-Item -Path "." -Name "priinfo" -ItemType "directory"
-        Clear-Host
-        $PriItem = Get-Item ".\pri\*" -Include "*.pri"
-        Write-Output "Dumping resources...."
-        $i = 0
-        $Processes = ForEach ($Item in $PriItem) {
-            Start-Process -PassThru -WindowStyle Hidden makepri.exe -Args "dump /if $($Item | Resolve-Path -Relative) /o /es .\pri\resources.pri /of .\priinfo\$($Item.Name).xml /dt detailed"
-            ++$i
-            $Completed = ($i / $PriItem.count) * 100
-            Write-Progress -Activity "Dumping resources" -Status "Dumping $($Item.Name):" -PercentComplete $Completed
-        }
-        $Processes | Wait-Process
-        Write-Progress -Activity "Dumping resources" -Status "Ready" -Completed
-        Clear-Host
-        Write-Output "Creating pri from dumps...."
-        $ProcNewFromDump = Start-Process -PassThru -NoNewWindow makepri.exe -Args "new /pr .\priinfo /cf .\xml\priconfig.xml /of .\resources.pri /mn $AppxManifestFile /o"
-        $null = $ProcNewFromDump.Handle
-        $ProcNewFromDump.WaitForExit()
-        Remove-Item 'priinfo' -Recurse
-        If ($ProcNewFromDump.ExitCode -Ne 0) {
-            Write-Error "Failed to create resources from priinfos"
-            exit 1
-        }
+    Clear-Host
+    $AppxManifestFile = ".\AppxManifest.xml"
+    $PriItem = Get-Item ".\pri\*" -Include "*.pri"
+    Write-Output "Dumping resources...."
+    $i = 0
+    $Processes = ForEach ($Item in $PriItem) {
+        Start-Process -PassThru -WindowStyle Hidden makepri.exe -Args "dump /if $($Item | Resolve-Path -Relative) /o /es .\pri\resources.pri /of .\priinfo\$($Item.Name).xml /dt detailed"
+        ++$i
+        $Completed = ($i / $PriItem.count) * 100
+        Write-Progress -Activity "Dumping resources" -Status "Dumping $($Item.Name):" -PercentComplete $Completed
+    }
+    $Processes | Wait-Process
+    Write-Progress -Activity "Dumping resources" -Status "Ready" -Completed
+    Clear-Host
+    Write-Output "Creating pri from dumps...."
+    $ProcNewFromDump = Start-Process -PassThru -NoNewWindow makepri.exe -Args "new /pr .\priinfo /cf .\xml\priconfig.xml /of .\resources.pri /mn $AppxManifestFile /o"
+    $null = $ProcNewFromDump.Handle
+    $ProcNewFromDump.WaitForExit()
+    Remove-Item 'priinfo' -Recurse
+    If ($ProcNewFromDump.ExitCode -Ne 0) {
+        Write-Error "Failed to create resources from priinfos"
+        exit 1
     }
 
     $ProjectXml = [xml](Get-Content $AppxManifestFile)