Skip to content

Commit

Permalink
fix merge conflict [skip-edge]
Browse files Browse the repository at this point in the history
  • Loading branch information
th3w1zard1 committed Feb 24, 2024
1 parent 9d9f145 commit 97a3e87
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions compile/deps_batchpatcher.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ $this_noprompt_arg = if ($this_noprompt) {'-noprompt'} else {''}
$venv_name_arg = if ($venv_name) {"-venv_name $venv_name"} else {''}
. $rootPath/install_python_venv.ps1 $this_noprompt_arg $venv_name_arg

Write-Host "Initializing python virtual environment..."
$this_noprompt_arg = if ($this_noprompt) {'-noprompt'} else {''}
$venv_name_arg = if ($venv_name) {"-venv_name $venv_name"} else {''}
. $rootPath/install_python_venv.ps1 $this_noprompt_arg $venv_name_arg

$output = & $pythonExePath -c "import tkinter; print('Tkinter is available')" 2>&1
if ($output -match "ModuleNotFoundError" -or $output -is [System.Management.Automation.ErrorRecord]) {
Write-Host "Tkinter is not available for $($pythonExePath)"
Expand Down

0 comments on commit 97a3e87

Please sign in to comment.