parenthesis issue in activate.bat - caused by PR 2221

[rusitzky]

The fix in #2221 for the extra parenthesis in "activate.bat" seems to have broken the prompt change when used interactively. Now, the prompt does not change when you invoke "activate.bat". I agree there was an extra parenthesis before this fix, but apparently that caused the SET PROMPT to have the correct updated value of ENV_PROMPT when it was evaluated b/c that put it outside the other block.

[gaborbernat]

@SiggyBar can you look into this?

[SigmundVik]

Yes, #2221 did indeed break the prompt, sorry about that 😢 (I am not using cmd, so I did not notice.)

The problem is caused by the expansion order inside the if, as explained here. For some obscure reason, the stray closing parenthesis changed the expansion order..

Maybe this is an acceptable fix?

if not defined VIRTUAL_ENV_DISABLE_PROMPT (
    set "ENV_PROMPT=__VIRTUAL_PROMPT__"
    if NOT DEFINED ENV_PROMPT (
        for %%d in ("%VIRTUAL_ENV%") do set "ENV_PROMPT=(%%~nxd) "
    )
    set "PROMPT=%ENV_PROMPT%%PROMPT%"
)

->

if not defined VIRTUAL_ENV_DISABLE_PROMPT (
    if "__VIRTUAL_PROMPT__" NEQ "" (
        set "PROMPT=__VIRTUAL_PROMPT__%PROMPT%"
    ) else (
        for %%d in ("%VIRTUAL_ENV%") do set "PROMPT=(%%~nxd) %PROMPT%"
    )
)

[gaborbernat]

Please put in a PR if solves the issue 👍