X-Git-Url: https://git.mdrn.pl/fnpdjango.git/blobdiff_plain/6d8e536282ff7e20950f36321989c94d6e44b363..7af1811c6f9392264cd151e7bf0a9953dbb152ad:/bin/fnpdjango_bootstrap.sh?ds=sidebyside

diff --git a/bin/fnpdjango_bootstrap.sh b/bin/fnpdjango_bootstrap.sh
index 5e7babe..30e9007 100755
--- a/bin/fnpdjango_bootstrap.sh
+++ b/bin/fnpdjango_bootstrap.sh
@@ -1,11 +1,19 @@
 #!/bin/bash
+#
+# Use as: 
+#
+#   source <(curl -L pypi.nowoczesnapolska.org.pl/django)
+#
+
 
 PROJECT="$1"
 
 # 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=64c636d1e3ff35a7a1d3394fd1d3ff0093f44aa2;sf=tgz'
 VIRTUALENVWRAPPER_PATHS="
     /etc/bash_completion.d/virtualenvwrapper
     /usr/bin/virtualenvwrapper.sh
@@ -52,19 +60,24 @@ 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.default "$PROJECT"/localsettings.py
+
+WRAPPER="`ls`"
+mv "$WRAPPER/"* "$WRAPPER/".gitignore .
+rmdir "$WRAPPER"
+
+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