From c3dfaf79ef94cc817e12b43fecb2baf6a885ec86 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 7 Jul 2013 21:54:42 -0600 Subject: parabolaweb-update: assume that there is a centralized Makefile --- parabolaweb-update | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/parabolaweb-update b/parabolaweb-update index be218ba..6b27e72 100755 --- a/parabolaweb-update +++ b/parabolaweb-update @@ -18,24 +18,12 @@ . /etc/conf.d/parabolaweb . libremessages -find_makefiles() { - pushd "$WEBDIR" > /dev/null - echo ./sitestatic - find . -name static -type d | while read dir; do - if [[ -e "$WEBDIR/$dir/Makefile" ]]; then - printf '%s\n' "$dir" - fi - done -} - clean() { cd "$WEBDIR" msg "Purging old .pyc files..." find . -name '*.pyc' -delete msg "Purging old GNU Make generated files..." - for dir in `find_makefiles`; do - make -C "$WEBDIR/$dir" clean - done + make clean } configure() { @@ -72,12 +60,9 @@ update-database() { } update-filesystem() { - msg "Updating filesystem..." - for dir in `find_makefiles`; do - msg2 "Updating $dir with GNU Make..." - make -C "$WEBDIR/$dir" - done cd "$WEBDIR" + msg "Updating filesystem..." + make msg2 "Collecting static files..." echo yes | ./manage.py collectstatic -l } -- cgit v1.2.3