Improved the activate message after completing pinax-boot in release …

…mode to reduce confusion and provide a single line activation Tested on OS X and Windows to ensure this actually works.
pinax · Sep 2, 2009 · 4901e00 · 4901e00
1 parent af978e5
commit 4901e00
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/scripts/_installer.py b/scripts/_installer.py
@@ -256,13 +256,15 @@ def after_install(options, home_dir):
             ], show_stdout=True)
         finally:
             logger.indent -= 2
-        logger.notify("Please activate the newly created virtualenv by running in '%s': "
-                      % home_dir)
+        env_dir = os.path.normpath(home_dir)
+        logger.notify("Please activate the newly created virtualenv by running: ")
         logger.indent += 2
-        logger.notify("'source bin/activate' on Linux/Unix/Mac OS "
-                      "or '.\\Scripts\\activate.bat' on Windows")
+        if sys.platform == "win32":
+            logger.notify("%s\\Scripts\\activate.bat" % env_dir)
+        else:
+            logger.notify("source %s/bin/activate" % env_dir)
         logger.indent -= 2
-        logger.notify('Pinax environment created successfully.')
+        logger.notify("Pinax environment created successfully.")
     else:
         logger.notify("Cannot locate a VERSION file for release. You are "
             "likely not running from a release tarball. Perhaps you meant to "

diff --git a/scripts/pinax-boot.py b/scripts/pinax-boot.py
@@ -1251,13 +1251,15 @@ def after_install(options, home_dir):
             ], show_stdout=True)
         finally:
             logger.indent -= 2
-        logger.notify("Please activate the newly created virtualenv by running in '%s': "
-                      % home_dir)
+        env_dir = os.path.normpath(home_dir)
+        logger.notify("Please activate the newly created virtualenv by running: ")
         logger.indent += 2
-        logger.notify("'source bin/activate' on Linux/Unix/Mac OS "
-                      "or '.\\Scripts\\activate.bat' on Windows")
+        if sys.platform == "win32":
+            logger.notify("%s\\Scripts\\activate.bat" % env_dir)
+        else:
+            logger.notify("source %s/bin/activate" % env_dir)
         logger.indent -= 2
-        logger.notify('Pinax environment created successfully.')
+        logger.notify("Pinax environment created successfully.")
     else:
         logger.notify("Cannot locate a VERSION file for release. You are "
             "likely not running from a release tarball. Perhaps you meant to "