alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fixes for powershell on unix

Browse Source
This commit is contained in:
Andrei Gramakov 2020-05-13 14:00:38 +02:00
parent 4091d44cda
commit bc42073a8b
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
export.ps1
View File

@ -1,21 +1,16 @@
if ($env:MSYSTEM -ne $null) { #!/usr/bin/env pwsh
Write-Output "This .ps1 file is for Windows Powershell only. When using MSYS, run:`n. ./export.sh."
exit 1
}
$IDF_PATH = $PSScriptRoot $IDF_PATH = $PSScriptRoot
Write-Output "Setting IDF_PATH: $IDF_PATH" Write-Output "Setting IDF_PATH: $IDF_PATH"
$env:IDF_PATH=$IDF_PATH $env:IDF_PATH=$IDF_PATH
Write-Output "Adding ESP-IDF tools to PATH..." Write-Output "Adding ESP-IDF tools to PATH..."
$OLD_PATH=$env:Path.split(";") | Select-Object -Unique # array without duplicates $OLD_PATH=$env:PATH.split([IO.Path]::PathSeparator) | Select-Object -Unique # array without duplicates
# using idf_tools.py to get $envars_array to set # using idf_tools.py to get $envars_array to set
$envars_raw = python.exe $IDF_PATH\tools\idf_tools.py export --format key-value $envars_raw = python $IDF_PATH/tools/idf_tools.py export --format key-value
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } # if error if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } # if error
$envars_array # will be filled like: $envars_array # will be filled like:
# [ # [
# [vname1, vval1], [vname2, vval2], ... # [vname1, vval1], [vname2, vval2], ...
# ] # ]
@ -24,8 +19,6 @@ foreach ($line in $envars_raw)
$pair = $line.split("=") # split in name, val $pair = $line.split("=") # split in name, val
$var_name = $pair[0].Trim() # trim spaces on the ends of the name $var_name = $pair[0].Trim() # trim spaces on the ends of the name
$var_val = $pair[1].Trim() # trim spaces on the ends of the val $var_val = $pair[1].Trim() # trim spaces on the ends of the val
$var_val = $var_val -replace "%(.+)%", "`$env:`$1" # convert var syntax to PS using RegEx
$var_val = $ExecutionContext.InvokeCommand.ExpandString($var_val) # expand variables to values
$envars_array+=(,($var_name, $var_val)) $envars_array+=(,($var_name, $var_val))
} }
@ -33,11 +26,22 @@ foreach ($pair in $envars_array) # setting the values
{ {
$var_name = $pair[0].Trim() # trim spaces on the ends of the name $var_name = $pair[0].Trim() # trim spaces on the ends of the name
$var_val = $pair[1].Trim() # trim spaces on the ends of the val $var_val = $pair[1].Trim() # trim spaces on the ends of the val
Set-Item -Path "Env:$var_name" -Value "$var_val" if ($var_name -eq "PATH"){
# trim "%PATH%" or "`$PATH"
if($IsWindows){
$var_val = $var_val.Trim([IO.Path]::PathSeparator + "%PATH%")
}else{
$var_val = $var_val.Trim([IO.Path]::PathSeparator + "`$PATH")
}
# apply
$env:PATH = $var_val + [IO.Path]::PathSeparator + $env:PATH
} else {
New-Item -Path "env:$var_name" -Value "$var_val"
}
} }
#Compare Path's OLD vs. NEW #Compare Path's OLD vs. NEW
$NEW_PATH = $env:Path.split(";") | Select-Object -Unique # array without duplicates $NEW_PATH = $env:PATH.split([IO.Path]::PathSeparator) | Select-Object -Unique # array without duplicates
$dif_Path = Compare-Object -ReferenceObject $OLD_PATH -DifferenceObject $NEW_PATH -PassThru $dif_Path = Compare-Object -ReferenceObject $OLD_PATH -DifferenceObject $NEW_PATH -PassThru
if ($dif_Path -ne $null) if ($dif_Path -ne $null)
{ {

11
install.ps1
View File

@ -1,18 +1,13 @@
if ($env:MSYSTEM -ne $null) { #!/usr/bin/env pwsh
Write-Output "This .ps1 file is for Windows Powershell only. When using MSYS, run:`n. ./export.sh."
exit 1
}
$IDF_PATH = $PSScriptRoot $IDF_PATH = $PSScriptRoot
Write-Output "Installing ESP-IDF tools" Write-Output "Installing ESP-IDF tools"
Start-Process -Wait -NoNewWindow -FilePath "python.exe" -Args "$IDF_PATH/tools/idf_tools.py install" Start-Process -Wait -NoNewWindow -FilePath "python" -Args "$IDF_PATH/tools/idf_tools.py install"
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } # if error if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } # if error
Write-Output "Setting up Python environment" Write-Output "Setting up Python environment"
Start-Process -Wait -NoNewWindow -FilePath "python.exe" -Args "$IDF_PATH/tools/idf_tools.py install-python-env" Start-Process -Wait -NoNewWindow -FilePath "python" -Args "$IDF_PATH/tools/idf_tools.py install-python-env"
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE} # if error if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE} # if error