From: Radek Czajka <radek.czajka@gmail.com>
Date: Wed, 31 Jul 2013 21:02:35 +0000 (+0200)
Subject: Respect src dir in bootstrap.
X-Git-Tag: 0.1.8~3
X-Git-Url: https://git.mdrn.pl/fnpdjango.git/commitdiff_plain/a3c086563f4029af00ddbbe3538476e382f0c151?ds=sidebyside;hp=9c3477977638139587d4b49a6d95061f7654c988

Respect src dir in bootstrap.
---

diff --git a/bin/fnpdjango_bootstrap.sh b/bin/fnpdjango_bootstrap.sh
index 80ebc97..de5ebea 100755
--- a/bin/fnpdjango_bootstrap.sh
+++ b/bin/fnpdjango_bootstrap.sh
@@ -6,6 +6,8 @@ PROJECT="$1"
 start_project() {
 
 DJANGO_REQ='Django>=1.5,<1.6'
+DJANGO_ROOT='src'
+PROJECT_TEMPLATE='http://git.nowoczesnapolska.org.pl/?p=fnpdjango.git;a=snapshot;h=8b4c794ea9a4783ad95f412925aa33e7b3da5375;sf=tgz'
 VIRTUALENVWRAPPER_PATHS="
     /etc/bash_completion.d/virtualenvwrapper
     /usr/bin/virtualenvwrapper.sh
@@ -52,19 +54,19 @@ pip install "$DJANGO_REQ"
 
 echo -e "${strong}Starting the project...${normal}"
 django-admin.py startproject \
-    --template http://pypi.nowoczesnapolska.org.pl/bootstrap/project.tar.gz \
+    --template "$PROJECT_TEMPLATE" \
     "$PROJECT"
 
 cd "$PROJECT"
-chmod +x manage.py
-mv "$PROJECT"/localsettings.py.dev "$PROJECT"/localsettings.py
+chmod +x "$DJANGO_ROOT"/manage.py
+mv "$DJANGO_ROOT/$PROJECT/localsettings.py.dev "$DJANGO_ROOT/$PROJECT/localsettings.py
 
 echo -e "${strong}Installing requirements...${normal}"
 pip install -r requirements.txt
 echo -e "${strong}Installing developer requirements...${normal}"
 pip install -r requirements-dev.txt
 echo -e "${strong}Running syncdb...${normal}"
-./manage.py syncdb --noinput
+"$DJANGO_ROOT"/manage.py syncdb --noinput
 
 echo -e "${strong}Starting new git repository...${normal}"
 git init