mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-06-29 10:49:41 +02:00
Merge branch 'cherry-pick-21004e09' into 'Pmodules-1.0'
Merge branch '198-dont-setenv-is-broken' into 'master' See merge request Pmodules/src!175
This commit is contained in:
@@ -172,16 +172,19 @@ proc _pmodules_setenv { PREFIX name version } {
|
||||
setenv $key $value
|
||||
}
|
||||
dict for {key value} $setenv_dirs {
|
||||
if { [lsearch ${::dont-setenv} $key] >= 0 || ![file isdirectory $key] } {
|
||||
if { [lsearch ${::dont-setenv} $value] >= 0 || ![file isdirectory $key] } {
|
||||
continue
|
||||
}
|
||||
setenv $value $key
|
||||
}
|
||||
dict for {key value} $prepend_dirs {
|
||||
if { [lsearch ${::dont-setenv} $key] >= 0 || ![file isdirectory $key] } {
|
||||
if { ![file isdirectory $key] } {
|
||||
continue
|
||||
}
|
||||
foreach var $value {
|
||||
if { [lsearch ${::dont-setenv} $var] >= 0 } {
|
||||
continue
|
||||
}
|
||||
prepend-path $var $key
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user