Respect src dir in bootstrap.

[fnpdjango.git] / bin / fnpdjango_bootstrap.sh

diff --git a/bin/fnpdjango_bootstrap.sh b/bin/fnpdjango_bootstrap.sh
index ecb80a0..de5ebea 100755 (executable)
--- a/bin/fnpdjango_bootstrap.sh
+++ b/bin/fnpdjango_bootstrap.sh
@@ -5,7 +5,9 @@ PROJECT="$1"
 # Make it a function, so that it works with `source`
 start_project() {
 
 # Make it a function, so that it works with `source`
 start_project() {
 

-DJANGO_REQ='Django>=1.4,<1.5'
+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
 VIRTUALENVWRAPPER_PATHS="
     /etc/bash_completion.d/virtualenvwrapper
     /usr/bin/virtualenvwrapper.sh


@@ -52,17 +54,20 @@ pip install "$DJANGO_REQ"
 
 echo -e "${strong}Starting the project...${normal}"
 django-admin.py startproject \
 
 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"
     "$PROJECT"
 
 cd "$PROJECT"

-chmod +x manage.py
-mv "$PROJECT"/localsettings.py.default "$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}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}"
+"$DJANGO_ROOT"/manage.py syncdb --noinput
+

 echo -e "${strong}Starting new git repository...${normal}"
 git init
 
 echo -e "${strong}Starting new git repository...${normal}"
 git init