Skip to content

Use platform-native separators in environment variables #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cottsay merged 1 commit into from
Jan 29, 2026
Merged

Use platform-native separators in environment variables #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion colcon_powershell/shell/template/hook_append_value.ps1.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# generated from colcon_powershell/shell/template/hook_append_value.ps1.em

@{
import os
value = '$env:COLCON_CURRENT_PREFIX'
if subdirectory:
value += '\\' + subdirectory
value += os.sep + subdirectory
}@
colcon_append_unique_value @(name) "@(value)"
3 changes: 2 additions & 1 deletion colcon_powershell/shell/template/hook_prepend_value.ps1.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# generated from colcon_powershell/shell/template/hook_prepend_value.ps1.em

@{
import os
value = '$env:COLCON_CURRENT_PREFIX'
if subdirectory:
value += '\\' + subdirectory
value += os.sep + subdirectory
}@
colcon_prepend_unique_value @(name) "@(value)"
13 changes: 7 additions & 6 deletions colcon_powershell/shell/template/package.ps1.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@{import os}@
# generated from colcon_powershell/shell/template/package.ps1.em

# function to append a value to a variable
Expand All @@ -22,15 +23,15 @@ function colcon_append_unique_value {
$_all_values=""
# iterate over existing values in the variable
if ($_values) {
$_values.Split(";") | ForEach {
$_values.Split("@(os.pathsep)") | ForEach {
# not an empty string
if ($_) {
# not a duplicate of _value
if ($_ -eq $_value) {
$_duplicate="1"
}
if ($_all_values) {
$_all_values="${_all_values};$_"
$_all_values="${_all_values}@(os.pathsep)$_"
} else {
$_all_values="$_"
}
Expand All @@ -41,7 +42,7 @@ function colcon_append_unique_value {
if (!$_duplicate) {
# avoid leading separator
if ($_all_values) {
$_all_values="${_all_values};${_value}"
$_all_values="${_all_values}@(os.pathsep)${_value}"
} else {
$_all_values="${_value}"
}
Expand Down Expand Up @@ -72,13 +73,13 @@ function colcon_prepend_unique_value {
$_all_values="$_value"
# iterate over existing values in the variable
if ($_values) {
$_values.Split(";") | ForEach {
$_values.Split("@(os.pathsep)") | ForEach {
# not an empty string
if ($_) {
# not a duplicate of _value
if ($_ -ne $_value) {
# keep non-duplicate values
$_all_values="${_all_values};$_"
$_all_values="${_all_values}@(os.pathsep)$_"
}
}
}
Expand Down Expand Up @@ -113,7 +114,7 @@ function colcon_package_source_powershell_script {
$env:COLCON_CURRENT_PREFIX=(Get-Item $PSCommandPath).Directory.Parent.Parent.FullName

@[end if]@
colcon_package_source_powershell_script "$env:COLCON_CURRENT_PREFIX\@(hook[0])"@
colcon_package_source_powershell_script "$env:COLCON_CURRENT_PREFIX@(os.sep)@(hook[0])"@
@[ for hook_arg in hook[1]]@
@(hook_arg)@
@[ end for]
Expand Down
5 changes: 3 additions & 2 deletions colcon_powershell/shell/template/prefix_chain.ps1.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@{import os}
# generated from colcon_powershell/shell/template/prefix_chain.ps1.em

# This script extends the environment with the environment of other prefix
Expand All @@ -24,10 +25,10 @@ function _colcon_prefix_chain_powershell_source_script {

# source chained prefixes
@[ for prefix in reversed(chained_prefix_path)]@
_colcon_prefix_chain_powershell_source_script "@(prefix)\@(prefix_script_no_ext).ps1"
_colcon_prefix_chain_powershell_source_script "@(prefix)@(os.sep)@(prefix_script_no_ext).ps1"
@[ end for]@
@[end if]@

# source this prefix
$env:COLCON_CURRENT_PREFIX=(Split-Path $PSCommandPath -Parent)
_colcon_prefix_chain_powershell_source_script "$env:COLCON_CURRENT_PREFIX\@(prefix_script_no_ext).ps1"
_colcon_prefix_chain_powershell_source_script "$env:COLCON_CURRENT_PREFIX@(os.sep)@(prefix_script_no_ext).ps1"
Loading