Fix post-start cleanup path references

pinax · Jan 17, 2018 · 76acedc · 76acedc
1 parent 8cb0fb3
commit 76acedc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -105,6 +105,10 @@ $ pinax tools
 
 ## Change Log
 
+### 1.1.1
+
+* Fix post-start cleanup path references
+
 ### 1.1.0
 
 * Drop Python 3.3 support

diff --git a/pcli.py b/pcli.py
@@ -41,17 +41,19 @@ def start_project(project, name, dev, location):
         sys.exit(1)
 
 
-def output_instructions(project, name):
+def output_instructions(project):
     if "instructions" in project:
         click.echo(project["instructions"])
 
 
-def cleanup(name):
-    # @@@ Should this be indicated in the project dict instead of hard coded?
-    os.remove(os.path.join(name, "LICENSE"))
-    os.remove(os.path.join(name, "CONTRIBUTING.md"))
-    os.remove(os.path.join(name, "update.sh"))
-    managepy = os.path.join(name, "manage.py")
+def cleanup(name, location):
+    if not location:
+        # if location was not specified, start_project used `name` for new subdir
+        location = name
+    os.remove(os.path.join(location, "LICENSE"))
+    os.remove(os.path.join(location, "CONTRIBUTING.md"))
+    os.remove(os.path.join(location, "update.sh"))
+    managepy = os.path.join(location, "manage.py")
     st = os.stat(managepy)
     os.chmod(managepy, st.st_mode | stat.S_IEXEC)
 
@@ -144,8 +146,8 @@ def start(config, dev, location, project, name):
                 pip_install("Django")
                 start_project(projects[project], name, dev, location)
                 click.echo("Finished")
-                output_instructions(projects[project], name)
-                cleanup(name)
+                output_instructions(projects[project])
+                cleanup(name, location)
             else:
                 click.echo("There are no releases for {}. You need to specify the --dev flag to use.".format(project))
         except KeyError:

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = "1.1.0"
+VERSION = "1.1.1"
 LONG_DESCRIPTION = """
 .. image:: http://pinaxproject.com/pinax-design/patches/pinax-blank.svg
     :target: https://pypi.python.org/pypi/pinax-cli/