Unescape

gitextensions · Sep 11, 2019 · 6861560 · mast-eu · Sep 11, 2019 · RussKie
1 parent 141365d
commit 6861560
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Bin/set-telemetry.ps1 b/Bin/set-telemetry.ps1
@@ -40,6 +40,9 @@ $_ = $topNode.AppendChild($node);
 $doc.Save($userAppDataPath)
 
 # this script now deletes itself
+if (![string]::IsNullOrWhiteSpace($ScriptPath)) {
+    $ScriptPath = $ScriptPath.Trim();
+}
 $fullScriptPath = [System.IO.Path]::Combine($ScriptPath, 'set-telemetry.ps1');
 if (Test-Path -Path $fullScriptPath) {
     Remove-Item $fullScriptPath -Force -ErrorAction SilentlyContinue

diff --git a/Setup/UI/TelemetryDlg.wxs b/Setup/UI/TelemetryDlg.wxs
@@ -17,7 +17,7 @@
     <SetProperty Id="ConfigureTelemetry"
         Before ="ConfigureTelemetry"
         Sequence="execute"
-        Value="&quot;[POWERSHELLEXE]&quot; -NoProfile -NonInteractive -InputFormat None -ExecutionPolicy Bypass -Command &quot;&amp; '[INSTALLDIR]set-telemetry.ps1' '[INSTALLDIR]' [TELEMETRY_ENABLED]; exit $$($Error.Count)&quot;" />
+        Value="&quot;[POWERSHELLEXE]&quot; -NoProfile -NonInteractive -InputFormat None -ExecutionPolicy Bypass -Command &quot;&amp; '[INSTALLDIR]set-telemetry.ps1' '[INSTALLDIR] ' [TELEMETRY_ENABLED]; exit $$($Error.Count)&quot;" />
 
     <CustomAction Id="ConfigureTelemetry" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="yes" />