From 3e6f34160deab4f774d90aba28122e5b6b6f9db2 Mon Sep 17 00:00:00 2001
From: Amr Bashir <48618675+amrbashir@users.noreply.github.com>
Date: Wed, 30 Jun 2021 20:12:37 +0200
Subject: [PATCH] fix(cli.rs): run powershell kill command without profile
 (#2130)

---
 .changes/cli-rs-powerhsell-no-profile.md             |  7 +++++++
 .../bundler/src/bundle/windows/templates/main.wxs    | 12 ++++++------
 tooling/cli.js/src/api/dependency-manager/rust.ts    |  2 +-
 tooling/cli.rs/src/dev.rs                            |  1 +
 4 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 .changes/cli-rs-powerhsell-no-profile.md

diff --git a/.changes/cli-rs-powerhsell-no-profile.md b/.changes/cli-rs-powerhsell-no-profile.md
new file mode 100644
index 000000000..3ea422d8a
--- /dev/null
+++ b/.changes/cli-rs-powerhsell-no-profile.md
@@ -0,0 +1,7 @@
+
+---
+ "cli.rs": patch
+ "cli.js": patch
+ "tauri-bundler": patch
+---
+Run powershell commands with `-NoProfile` flag
diff --git a/tooling/bundler/src/bundle/windows/templates/main.wxs b/tooling/bundler/src/bundle/windows/templates/main.wxs
index c2ce6727a..1687b385e 100644
--- a/tooling/bundler/src/bundle/windows/templates/main.wxs
+++ b/tooling/bundler/src/bundle/windows/templates/main.wxs
@@ -31,12 +31,12 @@
 
 
         <Media Id="1" Cabinet="app.cab" EmbedCab="yes" />
-        
+
         <WixVariable Id="WixUIBannerBmp" Value="{{{icon_path}}}" />
         {{#if license}}
         <WixVariable Id="WixUILicenseRtf" Value="{{{license}}}" />
         {{/if}}
-        
+
         <Icon Id="ProductIcon" SourceFile="{{{icon_path}}}"/>
         <Property Id="ARPPRODUCTICON" Value="ProductIcon" />
         <Property Id="ARPNOREPAIR" Value="yes" Secure="yes" />      <!-- Remove repair -->
@@ -111,7 +111,7 @@
 
         <DirectoryRef Id="ApplicationProgramsFolder">
             <Component Id="ApplicationShortcut" Guid="81ccebd8-b769-4bed-bdbd-0340f9f7cad1">
-                <Shortcut Id="ApplicationStartMenuShortcut" 
+                <Shortcut Id="ApplicationStartMenuShortcut"
                     Name="{{{product_name}}}"
                     Description="Runs {{{product_name}}}"
                     Target="[!Path]"
@@ -193,7 +193,7 @@
         <Property Id="WVRTINSTALLED">
             <RegistrySearch Id="WVRTInstalled" Root="HKLM" Key="SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Name="pv" Type="raw" Win64="no"/>
         </Property>
-        <CustomAction Id='DownloadAndInvokeBootstrapper' Directory="INSTALLDIR" Execute="deferred" ExeCommand='powershell.exe -windowstyle hidden Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/p/?LinkId=2124703" -OutFile "$env:TEMP\MicrosoftEdgeWebview2Setup.exe" ; &amp; $env:TEMP\MicrosoftEdgeWebview2Setup.exe /install' Return='check'/>
+        <CustomAction Id='DownloadAndInvokeBootstrapper' Directory="INSTALLDIR" Execute="deferred" ExeCommand='powershell.exe -NoProfile -windowstyle hidden Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/p/?LinkId=2124703" -OutFile "$env:TEMP\MicrosoftEdgeWebview2Setup.exe" ; &amp; $env:TEMP\MicrosoftEdgeWebview2Setup.exe /install' Return='check'/>
         <InstallExecuteSequence>
             <Custom Action='DownloadAndInvokeBootstrapper' Before='InstallFinalize'>
                 <![CDATA[NOT(REMOVE OR WVRTINSTALLED)]]>
@@ -201,6 +201,6 @@
         </InstallExecuteSequence>
         {{/if}}
 
-        <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize"/>        
+        <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize"/>
     </Product>
-</Wix>
\ No newline at end of file
+</Wix>
diff --git a/tooling/cli.js/src/api/dependency-manager/rust.ts b/tooling/cli.js/src/api/dependency-manager/rust.ts
index b820027b2..b22c29210 100644
--- a/tooling/cli.js/src/api/dependency-manager/rust.ts
+++ b/tooling/cli.js/src/api/dependency-manager/rust.ts
@@ -41,7 +41,7 @@ async function installRustup(): Promise<void> {
     await downloadRustup()
   }
   if (platform() === 'win32') {
-    return spawnSync('powershell', [rustupPath], process.cwd())
+    return spawnSync('powershell', ['-NoProfile', rustupPath], process.cwd())
   }
   return spawnSync('/bin/sh', [rustupPath], process.cwd())
 }
diff --git a/tooling/cli.rs/src/dev.rs b/tooling/cli.rs/src/dev.rs
index 33c1c6a85..c5564585e 100644
--- a/tooling/cli.rs/src/dev.rs
+++ b/tooling/cli.rs/src/dev.rs
@@ -32,6 +32,7 @@ fn kill_before_dev_process() {
     let mut child = child.lock().unwrap();
     #[cfg(windows)]
     let _ = Command::new("powershell")
+      .arg("-NoProfile")
       .arg("-Command")
       .arg(format!("function Kill-Tree {{ Param([int]$ppid); Get-CimInstance Win32_Process | Where-Object {{ $_.ParentProcessId -eq $ppid }} | ForEach-Object {{ Kill-Tree $_.ProcessId }}; Stop-Process -Id $ppid }}; Kill-Tree {}", child.id()))
       .status();