Doc and Makefile fixes (openedx-unsupported#447)

jmbowman · web-flow · commit 45c7685b9332 · 2019-10-20T23:36:52.000-04:00
diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ include *.mk
 # Generates a help message. Borrowed from https://github.com/pydanny/cookiecutter-djangopackage.
 help: ## Display this help message
 	@echo "Please use \`make <target>' where <target> is one of"
-	@perl -nle'print $& if m{^[\.a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m  %-25s\033[0m %s\n", $$1, $$2}'
+	@awk -F ':.*?## ' '/^[a-zA-Z]/ && NF==2 {printf "\033[36m  %-25s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort
 
 requirements: ## Install requirements
 	pip install -r requirements/base.txt
diff --git a/docs/pycharm_integration.rst b/docs/pycharm_integration.rst
@@ -69,7 +69,7 @@ use the following options:
   - For example, the path would be the following for the Ecommerce Service:
 
     - ``/edx/app/ecommerce/venvs/ecommerce/bin/python``
-    - Note: The Credentials Service might not have a virtualenv set up in the container. 
+    - Note: The Credentials Service might not have a virtualenv set up in the container.
 
   - For either lms or studio, you need to use edxapp:
 
@@ -324,6 +324,6 @@ One way to do this is to follow these instructions:
 .. _Django Server Run/Debug Configuration: https://www.jetbrains.com/help/pycharm/2017.1/run-debug-configuration-django-server.html
 .. _Jetbrains ticket PY-22893: https://youtrack.jetbrains.com/issue/PY-22893
 .. _PyCharm: https://www.jetbrains.com/pycharm/
-.. _PyCharm IDE setup: https://openedx.atlassian.net/wiki/spaces/OpenDev/pages/92209229/PyCharm
+.. _PyCharm IDE setup: https://openedx.atlassian.net/wiki/spaces/AC/pages/92209229/PyCharm
 .. _README: ../README.rst
 .. _vendor documentation: https://www.jetbrains.com/help/pycharm/2017.1/configuring-remote-interpreters-via-docker-compose.html
diff --git a/marketing.mk b/marketing.mk
@@ -1,6 +1,6 @@
 help-marketing: ## Display this help message
 	@echo "Please use \`make <target>' where <target> is one of"
-	@perl -nle'print $& if m{^[\.a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | grep marketing | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m  %-25s\033[0m %s\n", $$1, $$2}'
+	@awk -F ':.*?## ' '/^[a-zA-Z]/ && NF==2 {printf "\033[36m  %-25s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | grep marketing | sort
 
 marketing-shell: ## Run a shell on the marketing site container
 	docker exec -it edx.devstack.marketing env TERM=$(TERM) bash -c 'cd /edx/app/edx-mktg/edx-mktg; exec /bin/bash -sh'
