diff --git a/docs/changelog/1371.feature.rst b/docs/changelog/1371.feature.rst new file mode 100644 index 000000000..45dfa5b71 --- /dev/null +++ b/docs/changelog/1371.feature.rst @@ -0,0 +1 @@ +``activate.ps1`` syntax and style updated to follow ``PSStyleAnalyzer`` rules diff --git a/virtualenv.py b/virtualenv.py index 3ccbed6df..82e657cad 100755 --- a/virtualenv.py +++ b/virtualenv.py @@ -2372,18 +2372,19 @@ def convert(s): # file activate.ps1 ACTIVATE_PS = convert( """ -eJytVcFu2zAMvfsrWNfYEmx2sWuGHVIkQAO0adBkvWyDoMh0I0CWDElOGwz598p2HDt20w3YdLP5 -SD2Sj9QlrDbcQMIFQpobC2uEWFkwKtcMY0i0SmGhlpuvsFM5MCqls+pcArcQc43Mil0EEwXWxRlB -BNEVZZZvqcUoM188LzBM88yOVjezJVmMVzfwDYJ0x+VWMWq5klG6YypNqYyjjNrN0eF6vJySyezB -4U0muA0LKww0GiW2WH35wTHsVRT5QwgXVKO0npfkkhXR4UmoNRWjGGtagx/mmVu2+QXBXMkJGqvz -woRD77cH7vAEBtb9rq7YUs3pWuCI3N9OyOPsYfV9fFveOCzRlU9xApTbUZ3hebcjXmOqXCI1Evwe -1IfQMJXhIYnSc++9QbLOdkSUiMmWa5tTQTLXvMz2aB7Blb1g+55/ly+3mDYX/jzn0eJZFqbOazp/ -7DEqQjjMaae7XhAKpMmbbHpI1FppWgnAOG1Lp1KmpOUyxy67i54MTtldwhJFAvEBcfF+PRqdvY/L -drFiByr7vlwrc0Ui29mNs4QplH8hoPrJFE6XkEuDFrjWKHBLpT2q1XgNEQilknGToJvJdrFc++tR -83o1d8bWp/M88OtJtUDW+vfak+B3Y14Rcj2bk/n4bkrcKWBkOV0Q4sOnVoyqNR1fR3I5vr6dksXD -/d1iVU9st3rnNNk01fcPtT+diDccT8ajFavg55OmBiWhIolQulH2uyrqNfh0thpgJblxHLuNisDc -TnYbONOY8BewqvyJL9w4KT9BJ0hxnrXTWbhRbpWfYackPgsu8cTtw1/ugH2rbCgM/nuWtJMcy3Wx -wQ+5fYZ17h4aJT8Wz41hVMfu5YnOpjwIBn/eITAcwn+rxN57BRHvOEk= +eJytVV1vmzAUfedX3FK0Jeqg2mumPtAlUiOlaRSyvmyT5cBNYwlsZBvaaMp/nyEQCCRVNc1v9v3w +Ofeea1/DassUbFiMkGRKwxohEhqUyGSIEWykSGAhgu032IkMQsq5scqMA9MQMYmhjncejAVok2cE +Hni3NNQspxq9VH21LEeFkqV6tHqYBmThrx7gDpxkx3guQqqZ4F6yC0WSUB55KdXbY8C9H0zIeLo0 +/kEaM+0ujBUGS1QizvGws51j2lvPs4dgjiVybVmbjIdFdniJxZrGowhrWIOf6pXpcPsbnLngY1Ra +ZoUJh/DHArPYBgYrc3y4IqeS0XWMI/I0G5Pn6XL1w5+VN9b+xXKQ56Oa3eWQo/8SE2FIPFeeYPdc +bXCDUKRYESgj99YZgDXTERFxRHImdUZjkprGpfoE4tHxYCuQvhfbxTrVmDSX/boU0cJYFqXmNJk/ +t9G0k3bcwJ1IKaR/6F9gpMmNyL4LrhnPsHvJ1YUuFusaAow3EFXWq/cpNRJ53y/dRSKsYOz7SivN +FYh0p7fG4iZwOHWofFFF0DVkXKEGJiXGmFOuj0JTVgMEXC541JAz49QulOlgPSVWt9iFsbW1rDm+ +Nno70Ra4c5og9CQIxj/OsBG3ZbV1bnevvCXkfjonc/9xQswq3EgwWRBiw00ryaFrnVjDIfDvZxOy +WD49LlZ1F7vFPaO6Vr9tu2rLqd7PBd315qGRlE2aMpRoCgYuN1Nqt9XVa3wXzkGCfhSZxxEhNM+r +eUxTiRv2BlqUh/jGlJH1C3RmriRgXHMmMlVhJnnZjTv49MHBLdZ5MjcXkg+PsftWJTFW+G+8aYdu +mMniea7YfoF1Zn4RwT8Xf4kKqYzMt+L9/yI4HF+78fbAGbQ/lt78uDOkGxgOwT4taD/Zx6u5t/4C +0ptRdg== """ ) diff --git a/virtualenv_embedded/activate.ps1 b/virtualenv_embedded/activate.ps1 index 3bbf9a61e..e8daf3498 100644 --- a/virtualenv_embedded/activate.ps1 +++ b/virtualenv_embedded/activate.ps1 @@ -1,38 +1,31 @@ # This file must be dot sourced from PoSh; you cannot run it directly. Do this: . ./activate.ps1 $script:THIS_PATH = $myinvocation.mycommand.path -$script:BASE_DIR = split-path (resolve-path "$THIS_PATH/..") -Parent +$script:BASE_DIR = Split-Path (Resolve-Path "$THIS_PATH/..") -Parent -function global:deactivate([switch] $NonDestructive) -{ - if (test-path variable:_OLD_VIRTUAL_PATH) - { +function global:deactivate([switch] $NonDestructive) { + if (Test-Path variable:_OLD_VIRTUAL_PATH) { $env:PATH = $variable:_OLD_VIRTUAL_PATH - remove-variable "_OLD_VIRTUAL_PATH" -scope global + Remove-Variable "_OLD_VIRTUAL_PATH" -Scope global } - if (test-path function:_old_virtual_prompt) - { + if (Test-Path function:_old_virtual_prompt) { $function:prompt = $function:_old_virtual_prompt - remove-item function:\_old_virtual_prompt + Remove-Item function:\_old_virtual_prompt } - if ($env:VIRTUAL_ENV) - { - $old_env = split-path $env:VIRTUAL_ENV -leaf - remove-item env:VIRTUAL_ENV -erroraction silentlycontinue + if ($env:VIRTUAL_ENV) { + Remove-Item env:VIRTUAL_ENV -ErrorAction SilentlyContinue } - if (!$NonDestructive) - { + if (!$NonDestructive) { # Self destruct! - remove-item function:deactivate - remove-item function:pydoc + Remove-Item function:deactivate + Remove-Item function:pydoc } } -function global:pydoc -{ +function global:pydoc { python -m pydoc $args } @@ -42,31 +35,28 @@ deactivate -nondestructive $VIRTUAL_ENV = $BASE_DIR $env:VIRTUAL_ENV = $VIRTUAL_ENV -$global:_OLD_VIRTUAL_PATH = $env:PATH +New-Variable -Scope global -Name _OLD_VIRTUAL_PATH -Value $env:PATH + $env:PATH = "$env:VIRTUAL_ENV/__BIN_NAME____PATH_SEP__" + $env:PATH -if (!$env:VIRTUAL_ENV_DISABLE_PROMPT) -{ - function global:_old_virtual_prompt - { +if (!$env:VIRTUAL_ENV_DISABLE_PROMPT) { + function global:_old_virtual_prompt { "" } $function:_old_virtual_prompt = $function:prompt - if ("__VIRTUAL_PROMPT__" -ne "") - { - function global:prompt - { + + if ("__VIRTUAL_PROMPT__" -ne "") { + function global:prompt { # Add the custom prefix to the existing prompt - write-host "__VIRTUAL_PROMPT__" -nonewline - & $function:_old_virtual_prompt + $previous_prompt_value = & $function:_old_virtual_prompt + ("__VIRTUAL_PROMPT__" + $previous_prompt_value) } } - else - { - function global:prompt - { + else { + function global:prompt { # Add a prefix to the current prompt, but don't discard it. - write-host "($( split-path $env:VIRTUAL_ENV -leaf )) " -nonewline - & $function:_old_virtual_prompt + $previous_prompt_value = & $function:_old_virtual_prompt + $new_prompt_value = "($( Split-Path $env:VIRTUAL_ENV -Leaf )) " + ($new_prompt_value + $previous_prompt_value) } } }