fix run.ps1 being in %PATH% (#7481)

This commit is contained in:
Manuel Meitinger 2025-01-16 14:51:05 +01:00 committed by GitHub
parent dfb2b273a2
commit ffb40ae212
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions

View file

@ -21,6 +21,9 @@
<distributionFile>
<origin>logo.ico</origin>
</distributionFile>
<distributionFile>
<origin>run.ps1</origin>
</distributionFile>
</distributionFileList>
</folder>
<folder>
@ -33,9 +36,6 @@
<allowWildcards>1</allowWildcards>
<origin>../build/pyinstaller/out/onedir/*</origin>
</distributionFile>
<distributionFile>
<origin>run.ps1</origin>
</distributionFile>
</distributionFileList>
</folder>
</folderList>
@ -59,7 +59,7 @@
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>powershell.exe</windowsExec>
<windowsExecArgs>-File "${installdir}\bin\run.ps1" mitmproxy</windowsExecArgs>
<windowsExecArgs>-File "${installdir}\run.ps1" mitmproxy</windowsExecArgs>
<windowsIcon>${installdir}/logo.ico</windowsIcon>
<windowsPath>${user_home_directory}</windowsPath>
</startMenuShortcut>
@ -69,7 +69,7 @@
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>powershell.exe</windowsExec>
<windowsExecArgs>-File "${installdir}\bin\run.ps1" mitmweb</windowsExecArgs>
<windowsExecArgs>-File "${installdir}\run.ps1" mitmweb</windowsExecArgs>
<windowsIcon>${installdir}/logo.ico</windowsIcon>
<windowsPath>${user_home_directory}</windowsPath>
</startMenuShortcut>
@ -79,7 +79,7 @@
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>powershell.exe</windowsExec>
<windowsExecArgs>-File "${installdir}\bin\run.ps1" mitmdump</windowsExecArgs>
<windowsExecArgs>-File "${installdir}\run.ps1" mitmdump</windowsExecArgs>
<windowsIcon>${installdir}/logo.ico</windowsIcon>
<windowsPath>${user_home_directory}</windowsPath>
</startMenuShortcut>
@ -98,7 +98,7 @@
<finalPageActionList>
<runProgram>
<program>cmd</program>
<programArguments>/c powershell -File "${installdir}\bin\run.ps1" mitmproxy &amp;</programArguments>
<programArguments>/c powershell -File "${installdir}\run.ps1" mitmproxy &amp;</programArguments>
<progressText>Launch mitmproxy now</progressText>
<workingDirectory>${user_home_directory}</workingDirectory>
</runProgram>

View file

@ -1,6 +1,6 @@
$tool = $args[0]
if (Get-Command wt -ErrorAction SilentlyContinue) {
Start-Process wt -ArgumentList "powershell.exe","-Command","& '$PSScriptRoot\$tool.exe'"
Start-Process wt -ArgumentList "powershell.exe","-Command","& '$PSScriptRoot\bin\$tool.exe'"
} else {
Start-Process powershell -ArgumentList "-Command","& '$PSScriptRoot\$tool.exe'"
Start-Process powershell -ArgumentList "-Command","& '$PSScriptRoot\bin\$tool.exe'"
}