From 3d8f2a5f394afdc55333e6c2ce98dd391bf478d2 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Mon, 30 Dec 2013 14:05:02 +0100 Subject: [PATCH 1/1] Fix top directory issue (again) --- bin/fnpdjango_bootstrap.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bin/fnpdjango_bootstrap.sh b/bin/fnpdjango_bootstrap.sh index fef20de..0fb8543 100755 --- a/bin/fnpdjango_bootstrap.sh +++ b/bin/fnpdjango_bootstrap.sh @@ -15,7 +15,7 @@ DJANGO_REQ='Django>=1.6,<1.7' DJANGO_ROOT='src' PYPI='http://pypi.nowoczesnapolska.org.pl/simple' -PROJECT_TEMPLATE='http://git.nowoczesnapolska.org.pl/?p=fnpdjango.git;a=snapshot;h=64c636d1e3ff35a7a1d3394fd1d3ff0093f44aa2;sf=tgz' +PROJECT_TEMPLATE='http://git.nowoczesnapolska.org.pl/?p=fnpdjango.git;a=snapshot;h=95e41c888d219481622111ea0cd7f59b7c47b625;sf=tgz' VIRTUALENVWRAPPER_PATHS=" /etc/bash_completion.d/virtualenvwrapper @@ -71,6 +71,14 @@ django-startproject.py \ cd "$PROJECT" +# GitWeb adds a top directory to the snapshot, let's remove it. +if [ ! -e .gitignore ] +then + WRAPPER="`ls`" + mv "$WRAPPER/"* "$WRAPPER/".gitignore . + rmdir "$WRAPPER" +fi + chmod +x "$DJANGO_ROOT"/manage.py mv "$DJANGO_ROOT/$PROJECT/localsettings.py.dev" "$DJANGO_ROOT/$PROJECT/localsettings.py" -- 2.20.1