From 4819d5b97d682c3a009b4114a927fc710c2fa115 Mon Sep 17 00:00:00 2001
From: torzdf <36920800+torzdf@users.noreply.github.com>
Date: Tue, 27 Jun 2023 16:05:53 +0100
Subject: [PATCH] bugfixes:   - Remove duplicate line from Dockerfile.gpu   -
 Add more robust Conda checking

---
 Dockerfile.gpu | 1 -
 setup.py       | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.gpu b/Dockerfile.gpu
index d62e010f..5b9c0abd 100755
--- a/Dockerfile.gpu
+++ b/Dockerfile.gpu
@@ -12,7 +12,6 @@ RUN ln -s $(which python3) /usr/local/bin/python
 RUN git clone --depth 1 --no-single-branch https://github.com/deepfakes/faceswap.git
 WORKDIR "/faceswap"
 
-RUN python -m pip install --upgrade pip
 RUN python -m pip install --upgrade pip
 RUN python -m pip --no-cache-dir install -r ./requirements/requirements_nvidia.txt
 
diff --git a/setup.py b/setup.py
index d17f4c8a..e9b55391 100755
--- a/setup.py
+++ b/setup.py
@@ -101,7 +101,8 @@ class Environment():
     def is_conda(self) -> bool:
         """ Check whether using Conda """
         return ("conda" in sys.version.lower() or
-                os.path.exists(os.path.join(sys.prefix, 'conda-meta')))
+                os.path.exists(os.path.join(sys.prefix, 'conda-meta'))
+                or os.environ.get("CONDA_DEFAULT_ENV"))
 
     @property
     def is_admin(self) -> bool: