Merge branch 'test-2024-02-07-refactor-noapps' into CW-MicroWin

CodingWonders · Mar 21, 2024 · e21d4fa · e21d4fa
2 parents 832f08c + b8397ff
commit e21d4fa
Show file tree

Hide file tree

Showing 6 changed files with 2,029 additions and 1,007 deletions.
diff --git a/Compile.ps1 b/Compile.ps1
@@ -24,15 +24,14 @@ Get-ChildItem .\functions -Recurse -File | ForEach-Object {
     Get-Content $psitem.FullName | Out-File ./$scriptname -Append -Encoding ascii
 }
 
-$xaml = (Get-Content .\xaml\inputXML.xaml).replace("'","''")
-Write-output "`$inputXML =  '$xaml'" | Out-File ./$scriptname -Append -Encoding ascii
-
 Get-ChildItem .\config | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
     $json = (Get-Content $psitem.FullName).replace("'","''")
     $sync.configs.$($psitem.BaseName) = $json | convertfrom-json
     Write-output "`$sync.configs.$($psitem.BaseName) = '$json' `| convertfrom-json" | Out-File ./$scriptname -Append -Encoding ascii
 }
 
+$xaml = (Get-Content .\xaml\inputXML.xaml).replace("'","''")
+
 # Dot-source the Get-TabXaml function
 . .\functions\private\Get-TabXaml.ps1
 
@@ -44,4 +43,21 @@ $tabColumns | Out-File -FilePath ".\xaml\inputTweaks.xaml" -Encoding ascii
 $tabColumns = Get-TabXaml "feature"
 $tabColumns | Out-File -FilePath ".\xaml\inputFeatures.xaml" -Encoding ascii
 
+# Assuming inputApp.xaml is in the same directory as main.ps1
+$appXamlPath = Join-Path -Path $PSScriptRoot -ChildPath "xaml/inputApp.xaml"
+$tweaksXamlPath = Join-Path -Path $PSScriptRoot -ChildPath "xaml/inputTweaks.xaml"
+$featuresXamlPath = Join-Path -Path $PSScriptRoot -ChildPath "xaml/inputFeatures.xaml"
+
+# Load the XAML content from inputApp.xaml
+$appXamlContent = Get-Content -Path $appXamlPath -Raw
+$tweaksXamlContent = Get-Content -Path $tweaksXamlPath -Raw
+$featuresXamlContent = Get-Content -Path $featuresXamlPath -Raw
+
+# Replace the placeholder in $inputXML with the content of inputApp.xaml
+$xaml = $xaml -replace "{{InstallPanel_applications}}", $appXamlContent
+$xaml = $xaml -replace "{{InstallPanel_tweaks}}", $tweaksXamlContent
+$xaml = $xaml -replace "{{InstallPanel_features}}", $featuresXamlContent
+
+Write-output "`$inputXML =  '$xaml'" | Out-File ./$scriptname -Append -Encoding ascii
+
 Get-Content .\scripts\main.ps1 | Out-File ./$scriptname -Append -Encoding ascii
diff --git a/config/applications.json b/config/applications.json
@@ -1108,7 +1108,7 @@
 		"choco": "na",
 		"content": "Neofetch",
 		"description": "Neofetch is a command-line utility for displaying system information in a visually appealing way.",
-		"link": "https://github.com/dylanaraps/neofetch",
+		"link": "https://github.com/nepnep39/neofetch-win",
 		"winget": "nepnep.neofetch-win"
 	},
 	"WPFInstallneovim": {

diff --git a/functions/public/Invoke-WPFRunAdobeCCCleanerTool.ps1 b/functions/public/Invoke-WPFRunAdobeCCCleanerTool.ps1
@@ -11,18 +11,22 @@ function Invoke-WPFRunAdobeCCCleanerTool {
     Write-Host "The Adobe Creative Cloud Cleaner tool is hosted at"
     Write-Host "$url"
 
-    # Don't show the progress because it will slow down the download speed
-    $ProgressPreference='SilentlyContinue'
+    try {
+        # Don't show the progress because it will slow down the download speed
+        $ProgressPreference='SilentlyContinue'
 
-    Invoke-WebRequest -Uri $url -OutFile "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -UseBasicParsing -ErrorAction SilentlyContinue -Verbose
+        Invoke-WebRequest -Uri $url -OutFile "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -UseBasicParsing -ErrorAction SilentlyContinue -Verbose
 
-    # Revert back the ProgressPreference variable to the default value since we got the file desired
-    $ProgressPreference='Continue'
+        # Revert back the ProgressPreference variable to the default value since we got the file desired
+        $ProgressPreference='Continue'
 
-    Start-Process -FilePath "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -Wait -ErrorAction SilentlyContinue -Verbose
-
-    if (Test-Path -Path "$env:TEMP\AdobeCreativeCloudCleanerTool.exe") {
-        Write-Host "Cleaning up..."
-        Remove-Item -Path "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -Verbose
+        Start-Process -FilePath "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -Wait -ErrorAction SilentlyContinue -Verbose
+    } catch {
+        Write-Error $_.Exception.Message
+    } finally {
+        if (Test-Path -Path "$env:TEMP\AdobeCreativeCloudCleanerTool.exe") {
+            Write-Host "Cleaning up..."
+            Remove-Item -Path "$env:TEMP\AdobeCreativeCloudCleanerTool.exe" -Verbose
+        }
     }
 }
diff --git a/scripts/main.ps1 b/scripts/main.ps1
@@ -52,22 +52,6 @@ $sync.runspace.Open()
 
 $inputXML = $inputXML -replace 'mc:Ignorable="d"', '' -replace "x:N", 'N' -replace '^<Win.*', '<Window'
 
-# Assuming inputApp.xaml is in the same directory as main.ps1
-$appXamlPath = Join-Path -Path $PSScriptRoot -ChildPath "xaml/inputApp.xaml"
-$tweaksXamlPath = Join-Path -Path $PSScriptRoot -ChildPath "xaml/inputTweaks.xaml"
-$featuresXamlPath = Join-Path -Path $PSScriptRoot -ChildPath "xaml/inputFeatures.xaml"
-
-# Load the XAML content from inputApp.xaml
-$appXamlContent = Get-Content -Path $appXamlPath -Raw
-$tweaksXamlContent = Get-Content -Path $tweaksXamlPath -Raw
-$featuresXamlContent = Get-Content -Path $featuresXamlPath -Raw
-
-# Replace the placeholder in $inputXML with the content of inputApp.xaml
-$inputXML = $inputXML -replace "{{InstallPanel_applications}}", $appXamlContent
-$inputXML = $inputXML -replace "{{InstallPanel_tweaks}}", $tweaksXamlContent
-$inputXML = $inputXML -replace "{{InstallPanel_features}}", $featuresXamlContent
-
-
 if ((Get-WinUtilToggleStatus WPFToggleDarkMode) -eq $True) {
     $ctttheme = 'Matrix'
 }