Move scripts from ‘C:\Windows\Temp’ to ‘C:\Windows\Setup\Scripts’

#18

Author: cschneegans

modifier/Bloatware.cs

@@ -20,7 +20,7 @@ public void Save(BloatwareModifier parent)
     {
       return;
     }
-    string scriptPath = @$"C:\Windows\Temp\{BaseName}.ps1";
+    string scriptPath = @$"C:\Windows\Setup\Scripts\{BaseName}.ps1";
     parent.AddTextFile(GetRemoveCommand(), scriptPath);
     parent.SpecializeScript.InvokeFile(scriptPath);
   }
@@ -38,7 +38,7 @@ private string GetRemoveCommand()
     sw.WriteLine($"$filterCommand = {FilterCommand};");
     sw.WriteLine($"$removeCommand = {RemoveCommand};");
     sw.WriteLine($"$type = '{Type}';");
-    sw.WriteLine($@"$logfile = 'C:\Windows\Temp\{BaseName}.log';");
+    sw.WriteLine($@"$logfile = 'C:\Windows\Setup\Scripts\{BaseName}.log';");
     return sw.ToString() + Util.StringFromResource("RemoveBloatware.ps1");
   }
 
@@ -80,7 +80,7 @@ class PackageRemover : Remover<PackageBloatwareStep>
     }
     """;
 
-  protected override string BaseName => "remove-packages";
+  protected override string BaseName => "RemovePackages";
 
   protected override string Type => "Package";
 }
@@ -115,7 +115,7 @@ class CapabilityRemover : Remover<CapabilityBloatwareStep>
     }
     """;
 
-  protected override string BaseName => "remove-caps";
+  protected override string BaseName => "RemoveCapabilities";
 
   protected override string Type => "Capability";
 }
@@ -150,7 +150,7 @@ class FeatureRemover : Remover<OptionalFeatureBloatwareStep>
     }
     """;
 
-  protected override string BaseName => "remove-features";
+  protected override string BaseName => "RemoveFeatures";
 
   protected override string Type => "Feature";
 }

modifier/Wdac.cs

@@ -130,10 +130,10 @@ void NewPathRule(string path, RuleType type)
           } catch {
             $_;
           }
-        ) *>&1 | Out-File -Append -FilePath "$env:TEMP\wdac.log";
+        ) *>&1 | Out-File -Append -FilePath 'C:\Windows\Setup\Scripts\Wdac.log"';
         """);
 
-      string ps1File = @"C:\Windows\Setup\Scripts\wdac.ps1";
+      string ps1File = @"C:\Windows\Setup\Scripts\Wdac.ps1";
       AddTextFile(sw.ToString(), ps1File);
       SpecializeScript.InvokeFile(ps1File);
     }

modifier/Wifi.cs

@@ -214,7 +214,7 @@ void AddWifiProfile(IProfileWifiSettings settings)
       throw new ConfigurationException($"WLAN profile XML is invalid: {e.Message}");
     }
 
-    string xmlfile = @"C:\Windows\Setup\Scripts\wifi.xml";
+    string xmlfile = @"C:\Windows\Setup\Scripts\Wifi.xml";
     AddXmlFile(profile, xmlfile);
 
     SpecializeScript.Append($"""

resource/ExtractScripts.ps1

@@ -2,14 +2,11 @@ param(
     [xml] $Document
 );
 
-$scriptsDir = 'C:\Windows\Setup\Scripts\';
 foreach( $file in $Document.unattend.Extensions.File ) {
     $path = [System.Environment]::ExpandEnvironmentVariables(
         $file.GetAttribute( 'path' )
     );
-    if( $path.StartsWith( $scriptsDir ) ) {
-        mkdir -Path $scriptsDir -ErrorAction 'SilentlyContinue';
-    }
+    mkdir -Path( $path | Split-Path -Parent ) -ErrorAction 'SilentlyContinue';
     $encoding = switch( [System.IO.Path]::GetExtension( $path ) ) {
         { $_ -in '.ps1', '.xml' } { [System.Text.Encoding]::UTF8; }
         { $_ -in '.reg', '.vbs', '.js' } { [System.Text.UnicodeEncoding]::new( $false, $true ); }

resource/VBoxGuestAdditions.ps1

@@ -9,4 +9,4 @@
 		}
 	}
 	'VBoxGuestAdditions.iso is not attached to this VM.';
-} *>&1 >> "$env:TEMP\VBoxGuestAdditions.log";
+} *>&1 >> 'C:\Windows\Setup\Scripts\VBoxGuestAdditions.log';

resource/VirtIoGuestTools.ps1

@@ -7,4 +7,4 @@
 		}
 	}
 	'VirtIO Guest Tools image (virtio-win-*.iso) is not attached to this VM.';
-} *>&1 >> "$env:TEMP\VirtIoGuestTools.log";
+} *>&1 >> 'C:\Windows\Setup\Scripts\VirtIoGuestTools.log';