summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Moore <p.f.moore@gmail.com>2019-08-23 09:13:45 +0100
committerBernát Gábor <bgabor8@bloomberg.net>2019-08-23 09:13:45 +0100
commit7174ccd569e0beea6be03ed06e1c5c3808f3aeb2 (patch)
tree4469eaf8bbba0d77ab75d7a9a5a05cc5d2bcb261
parent099cd8ef884ca487b6e7d8cc9e7ad843ed624cbc (diff)
downloadvirtualenv-7174ccd569e0beea6be03ed06e1c5c3808f3aeb2.tar.gz
Revert the incorrect Windows part of #1388 (#1408)
-rwxr-xr-xvirtualenv.py25
-rw-r--r--virtualenv_embedded/activate.ps17
2 files changed, 11 insertions, 21 deletions
diff --git a/virtualenv.py b/virtualenv.py
index 8f05739..b01b5ba 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -2393,20 +2393,17 @@ pk+k4fAba/wd0Pr4P2CqyLeOlJ4iKfkJo6v/iaH9YzfPMEoeMG2RUA==
# file activate.ps1
ACTIVATE_PS = convert(
"""
-eJytVW1v2jAQ/p5fcUujFdQm1dRvTJ1GV6YitRQR1mnaJsskB1hK7Mhx0qKJ/75LCCSEUlXT/Aly
-b89z95x9AtOlSGEuIoQ4Sw3MEEJlIFWZDjCEuVYxjJW//AgrlUHApSSrziQIA6HQGJho5cGNAkN5
-euCBd8EDI3Ju0EvSD5Yl5tD53HFkFkXn9lAa1JJHdhdcShQoabiQKTjxSshcBdwIJb1AxTGXodJi
-IWQX/lhA57sWBt1bRRjdr0rjQqtMhqAJpP2DoJXoTze4T0s0kAZaJKYHY/8TAXM6+1Xqn5LH2LXL
-KvhMvC4vrbVlOVX49Hbos3F/egtXLZzxqkLqJdwsdwHXfX/AboYT8veTSBh3TFboTDBVUY6bf7az
-S3vheUU7xlyjNJY1z2RQZIdFpGY86oW47WfnZ/okTLD8Dc5IyRtMjc4KE25bVLR6Sp83JXKuBZ9F
-2GMPdzfscTiZfuvflRW3/sVxUOa9LbvjITv/CcaKSDxWnmAfuNrg+oFKsCJQRlI7DwFumfaYikKW
-C20yHrGEFJeYPYg7x42tQPpabBvr0GBcF/t1LKKBsWzKltNg9NhE00zacgN3oLXS/c38fNopSdvx
-hUQuZIbtIu+OTLE4J+BjNIewsr57nVItkdf9klWoggrG+lBppbkCkazMkixuDJuvDteLtAg6gUym
-aEBojRHmXJqd0FKrBlKstwxrcrROzUbRBLdbYrWbXRgbfy1rhE+13va0Be6IVhcOJAjkH2VYi9uy
-mjq32yUvGLsejtiofz9gdAo35g/GjNlw1kiymVorljj4/eu7ARtPHu7H0+0U2819QXWNedt2NZZ9
-vb8UdHWwD7WkbFa3oURTMHAlbandVNfB4NtwNhLshyHdowgB3az0CiQa5+IZjCo/0kWZkqwX0Nq5
-kgC55kJlaYWZ5eU0ruD9Gxe3OC+TOTuSvLuLXTc6iVGK/8abt+gGmS6u54rtOcwyev6UPC0ewTTg
-OqT30Pv/TXAkPrXj7Y7TaT4sB/vj3iGfQ7cL9n5DD5O9vZtr6y9V3o9t
+eJytVU1v4jAQvftXTNNoF9QNvSP1kG6RikQpIiyX3ZXlJkOx5NiR46RFK/77Oh+QkEBVrXYOSPZ8
++L2ZN8FNQ80TM149TgO68FePcAduvOMyVyEzXMlRvAtVHDMZjRJmtsStE+79YEIfpksbHySCG29h
+vTBYYqpEjtXJcY9lb0cjZwj2WqM0hGwyGRbV4VWoFybGETJ7zpnBwc/0jZtw+xvcuZIPmBqdFS4c
+wh8C1vgGBit7XT2RM83Zi8AxfZ490PV0ufrhz8oXD/GFuSjz8YHd5ZRj/BJjZUms60hweqEOeEGo
+EqwJlJl7cgbggemYKhHRnGuTMUETreLEnEA8Bla+AulHuV2sU4Nx89ivSxktjGVTDpwm83UbTbto
+Jwy8idZK+9X8Ai7sQMXuu5KGywy7j1xdmGJh1xCg2EBUe68+ptRI5OO4ZBepsIax7yutdNcgkp3Z
+Wo8XQ3XrMv2aFknXkMkUDXCtUWDOpDkKLSUNEPCkklFDjhC33Sg7wcOWkG6zC2frSMgc3xq9nWgL
+vDmLEXoSBBsvMmzETUhb5073yVtK76dzOvefJtRaEUaDyYJSB25aRaqpdXIth8C/n03oYvn8tFgd
+ptht7hnVtebtOPVYTvV+Lumutw+NpBzatKFEUzDwpN1Sp62u3uC7cCoJ+lEEZosQZqlRVggaN/wd
+jCov8Z2nVtav0Nm5koANzbnK0hozzctp3MGXTy5uYefJ3FwoPjzm7ludRJHiv/FmHbphpovPc832
+G7xkBiIlv9pfnoZMR8DN6P83wZX41s13Bu6g/cfS2x9vhmwDwyE4pw3tF/t8N/fkLzQ3ME8=
"""
)
diff --git a/virtualenv_embedded/activate.ps1 b/virtualenv_embedded/activate.ps1
index 2a94af3..85b2103 100644
--- a/virtualenv_embedded/activate.ps1
+++ b/virtualenv_embedded/activate.ps1
@@ -1,10 +1,3 @@
-# This file must be dot sourced from PoSh; you cannot run it directly. Do this: . ./activate.ps1
-
-if (@($null,"Internal") -notcontains $myinvocation.commandorigin) {
- Write-Host -Foreground red "You must 'source' this script: PS> . $($myinvocation.invocationname)"
- exit 33
-}
-
$script:THIS_PATH = $myinvocation.mycommand.path
$script:BASE_DIR = Split-Path (Resolve-Path "$THIS_PATH/..") -Parent