From b0575d04cb0bd23a5d0185daccfe5916ce919cac Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 14 Nov 2012 16:48:22 -0500
Subject: update libre/parabolaweb-utils: run update_types_permissions if it
 exists

---
 libre/parabolaweb-utils/parabolaweb-update | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'libre/parabolaweb-utils/parabolaweb-update')

diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update
index 45e17c4f2..178917673 100644
--- a/libre/parabolaweb-utils/parabolaweb-update
+++ b/libre/parabolaweb-utils/parabolaweb-update
@@ -15,17 +15,18 @@ find_makefiles() {
 }
 
 clean() {
-	msg "Purging old .pyc files...."
 	cd "$WEBDIR"
+	msg "Purging old .pyc files..."
 	find . -name '*.pyc' -delete
+	msg "Purging GNU Make generated files..."
 	for dir in `find_makefiles`; do
 		make -C "$WEBDIR/$dir" clean
 	done
 }
 
 configure() {
-	msg "Checking configuration...."
 	cd "$WEBDIR"
+	msg "Checking configuration..."
 	if [[ ! -f local_settings.py ]]; then
 		msg2 "Configuration file missing, opening editor..."
 		cp local_settings.py.example local_settings.tmp.$$.py
@@ -36,7 +37,7 @@ configure() {
 			msg "Failed to configure, exiting"
 			exit 1
 		fi
-		msg2 "Creating database...."
+		msg2 "Creating database..."
 		./manage.py syncdb
 	else
 		msg2 "Current configuration checks out"
@@ -44,11 +45,15 @@ configure() {
 }
 
 update-database() {
-	msg "Updating database...."
 	cd "$WEBDIR"
-	msg2 "Running migrations...."
+	msg "Updating database..."
+	msg2 "Running migrations..."
 	./manage.py migrate
-	msg2 "Loading fixtures...."
+	if [[ -f devel/management/commands/update_types_permissions.py ]]; then
+		msg2 "Updating permission..."
+		./manage.py update_types_permissions
+	fi
+	msg2 "Loading fixtures..."
 	./manage.py loaddata */fixtures/*.json
 }
 
-- 
cgit v1.2.3-2-g168b