generate deactivate scripts by default in Env (#9539)

2 files changed, 6 insertions, 6 deletions

diff --git a/conan/tools/env/environment.py b/conan/tools/env/environment.py
index 9a07bc71..48bc1572 100644
--- a/conan/tools/env/environment.py
+++ b/conan/tools/env/environment.py
@@ -194,7 +194,7 @@ class Environment:
     def remove(self, name, value):
         self._values[name].remove(value)
 
-    def save_bat(self, filename, generate_deactivate=False, pathsep=os.pathsep):
+    def save_bat(self, filename, generate_deactivate=True, pathsep=os.pathsep):
         deactivate = textwrap.dedent("""\
             echo Capturing current environment in deactivate_{filename}
             setlocal
@@ -228,7 +228,7 @@ class Environment:
         content = "\n".join(result)
         save(filename, content)
 
-    def save_ps1(self, filename, generate_deactivate=False, pathsep=os.pathsep):
+    def save_ps1(self, filename, generate_deactivate=True, pathsep=os.pathsep):
         # FIXME: This is broken and doesnt work
         deactivate = ""
         capture = textwrap.dedent("""\
@@ -242,7 +242,7 @@ class Environment:
         content = "\n".join(result)
         save(filename, content)
 
-    def save_sh(self, filename, generate_deactivate=False, pathsep=os.pathsep):
+    def save_sh(self, filename, generate_deactivate=True, pathsep=os.pathsep):
         deactivate = textwrap.dedent("""\
             echo Capturing current environment in deactivate_{filename}
             echo echo Restoring variables >> deactivate_{filename}
diff --git a/conans/test/unittests/tools/env/test_env.py b/conans/test/unittests/tools/env/test_env.py
index 8758892c..a33b3d5a 100644
--- a/conans/test/unittests/tools/env/test_env.py
+++ b/conans/test/unittests/tools/env/test_env.py
@@ -257,7 +257,7 @@ def test_env_files():
 
     with chdir(folder):
         if platform.system() == "Windows":
-            env.save_bat("test.bat", pathsep=":", generate_deactivate=True)
+            env.save_bat("test.bat", pathsep=":")
 
             save("display.bat", display_bat)
             cmd = "test.bat && display.bat && deactivate_test.bat && display.bat"
@@ -270,7 +270,7 @@ def test_env_files():
             # stdout, stderr = decode_text(stdout), decode_text(stderr)
             # check(cmd)
         else:
-            env.save_sh("test.sh", pathsep=":", generate_deactivate=True)
+            env.save_sh("test.sh", pathsep=":")
             save("display.sh", display_sh)
             os.chmod("display.sh", 0o777)
             cmd = '. ./test.sh && ./display.sh && . ./deactivate_test.sh && ./display.sh'
@@ -294,7 +294,7 @@ def test_windows_case_insensitive():
         """)
 
     with chdir(folder):
-        env.save_bat("test.bat", generate_deactivate=True)
+        env.save_bat("test.bat")
         save("display.bat", display_bat)
         cmd = "test.bat && display.bat && deactivate_test.bat && display.bat"
         out, _ = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,