From 74df8746a3da85120887ebc1c9160355c85dc366 Mon Sep 17 00:00:00 2001
From: Andrei Gramakov <andrei.gramakov@espressif.com>
Date: Tue, 21 Jul 2020 14:47:27 +0200
Subject: [PATCH] scripts: updates export.ps1 to export tools' paths

---
 export.ps1 | 56 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/export.ps1 b/export.ps1
index a2cafd55a..12b03f71f 100644
--- a/export.ps1
+++ b/export.ps1
@@ -1,49 +1,61 @@
-if ($env:MSYSTEM -ne $null) {
-    Write-Output "This .ps1 file is for Windows Powershell only. When using MSYS, run:`n. ./export.sh."
-    exit 1
-}
-
+#!/usr/bin/env pwsh
+$S = [IO.Path]::PathSeparator # path separator. WIN:';', UNIX:":"
 
 $IDF_PATH = $PSScriptRoot
 
 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..."
-$OLD_PATH=$env:Path.split(";") | Select-Object -Unique # array without duplicates
+$OLD_PATH = $env:PATH.split($S) | Select-Object -Unique # array without duplicates
 # 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
 
-$envars_array # will be filled like: 
+$envars_array # will be filled like:
 #               [
 #                    [vname1, vval1], [vname2, vval2], ...
 #               ]
-foreach ($line  in $envars_raw)
-{
+foreach ($line  in $envars_raw) {
     $pair = $line.split("=") # split in name, val
     $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 = $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))
 }
 
-foreach ($pair  in $envars_array) # setting the values
-{
+foreach ($pair  in $envars_array) {
+    # setting the values
     $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
-    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($S + "%PATH%")
+        } else {
+            $var_val = $var_val.Trim($S + "`$PATH")
+        }
+        # apply
+        $env:PATH = $var_val + $S + $env:PATH
+    } else {
+        New-Item -Path "env:$var_name" -Value "$var_val" -Force
+    }
 }
 
+# Allow calling some IDF python tools without specifying the full path
+# ${IDF_PATH}/tools is already added by 'idf_tools.py export'
+$IDF_ADD_PATHS_EXTRAS = [IO.Path]::Combine(${IDF_PATH}, "components", "esptool_py", "esptool")
+$IDF_ADD_PATHS_EXTRAS += ${S} + [IO.Path]::Combine(${IDF_PATH}, "components", "app_update")
+$IDF_ADD_PATHS_EXTRAS += ${S} + [IO.Path]::Combine(${IDF_PATH}, "components", "espcoredump")
+$IDF_ADD_PATHS_EXTRAS += ${S} + [IO.Path]::Combine(${IDF_PATH}, "components", "partition_table")
+$env:PATH = $IDF_ADD_PATHS_EXTRAS + $S + $env:PATH
+
 #Compare Path's OLD vs. NEW
-$NEW_PATH = $env:Path.split(";") | Select-Object -Unique # array without duplicates
+$NEW_PATH = $env:PATH.split($S) | Select-Object -Unique # array without duplicates
 $dif_Path = Compare-Object -ReferenceObject $OLD_PATH -DifferenceObject $NEW_PATH -PassThru
-if ($dif_Path -ne $null)
-{
+if ($dif_Path -ne $null) {
+    Write-Output "`nAdded to PATH`n-------------"
     Write-Output $dif_Path
-}
-else {
+} else {
     Write-Output "No directories added to PATH:"
     Write-Output $OLD_PATH
 }