From a30f7ce023f088f521957c38f1a3838a494ad583 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 30 Nov 2012 14:26:04 +0100 Subject: [PATCH 1/1] Nicer project start. --- MANIFEST.in | 2 +- bin/fnpdjango_bootstrap.sh | 37 ++++++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index d4831cb..27f7cdf 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ -recursive-include fnpdjango/templates *.txt *.html +recursive-include fnpdjango/templates *.html recursive-include fnpdjango/locale *.po *.mo recursive-include fnpdjango/deploy/templates *.template diff --git a/bin/fnpdjango_bootstrap.sh b/bin/fnpdjango_bootstrap.sh index 40f6b9a..ecb80a0 100755 --- a/bin/fnpdjango_bootstrap.sh +++ b/bin/fnpdjango_bootstrap.sh @@ -1,7 +1,11 @@ #!/bin/bash -DJANGO_REQ='django>=1.4,<1.5' PROJECT="$1" + +# Make it a function, so that it works with `source` +start_project() { + +DJANGO_REQ='Django>=1.4,<1.5' VIRTUALENVWRAPPER_PATHS=" /etc/bash_completion.d/virtualenvwrapper /usr/bin/virtualenvwrapper.sh @@ -10,16 +14,16 @@ VIRTUALENVWRAPPER_PATHS=" # Colorful output. strong='\e[0;32m' +error='\e[1;31m' normal='\e[0m' -if [ -z "$PROJECT" ] -then - echo "Usage:" - echo " fnpdjango_bootstrap.sh " - echo "or:" - echo " wget -O-|bash /dev/stdin edumedfnpdjango_bootstrap.sh " -fi - +echo "Create new Django project." +while [ -z "$PROJECT" ] +do + echo "Name of the project:" + read PROJECT +done +echo -e "Project: ${strong}${PROJECT}${normal}" for venv in $VIRTUALENVWRAPPER_PATHS do @@ -34,11 +38,11 @@ then echo "virtualenvwrapper found at $VIRTUALENVWRAPPER." source "$VIRTUALENVWRAPPER" else - echo "ERROR: virtualenvwrapper not found. Tried locations:" + echo -e "${error}ERROR: virtualenvwrapper not found. Tried locations:${normal}" echo "$VIRTUALENVWRAPPER_PATHS" - echo "Install virtualenvwrapper or add the correct path to this script." + echo -e "${error}Install virtualenvwrapper or add the correct path to this script.${normal}" echo "Aborting." - exit + return fi echo -e "${strong}Creating virtualenv: $PROJECT...${normal}" @@ -53,7 +57,7 @@ django-admin.py startproject \ cd "$PROJECT" chmod +x manage.py -mv "$1"/localsettings.py.default "$PROJECT"/localsettings.py +mv "$PROJECT"/localsettings.py.default "$PROJECT"/localsettings.py echo -e "${strong}Installing requirements...${normal}" pip install -r requirements.txt @@ -62,3 +66,10 @@ pip install -r requirements-dev.txt echo -e "${strong}Starting new git repository...${normal}" git init +echo -e "${strong}What next?${normal}" +echo " * Work on your app, commit to git." +echo " * Review fabfile, use fab for deployment." + + +} +start_project -- 2.20.1