From d1e3c585e99796c0864b7dd55c0786665f7ad07e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 13 Apr 2015 19:28:58 -0400 Subject: Default configuration: detect RUNMAKE --- parabolaweb-update.in | 4 ++-- parabolaweb.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parabolaweb-update.in b/parabolaweb-update.in index 6a2ad02..2fed114 100644 --- a/parabolaweb-update.in +++ b/parabolaweb-update.in @@ -22,7 +22,7 @@ clean() { cd "$WEBDIR" msg "Purging old .pyc files..." find . -name '*.pyc' -delete - if $RUNMAKE; then + if $RUNMAKE &>/dev/null; then msg "Purging old GNU Make generated files..." make clean fi @@ -67,7 +67,7 @@ update-database() { update-filesystem() { cd "$WEBDIR" msg "Updating filesystem..." - if $RUNMAKE; then + if $RUNMAKE &>/dev/null; then msg2 "Re-creating GNU Make generated files..." make fi diff --git a/parabolaweb.conf b/parabolaweb.conf index 1dd696d..5245f34 100644 --- a/parabolaweb.conf +++ b/parabolaweb.conf @@ -3,7 +3,7 @@ WEBDIR=/srv/http/web GITURL='git://projects.parabolagnulinux.org/parabolaweb.git#branch=master' -RUNMAKE=false +RUNMAKE='pacman -Q parabolaweb-dev' FCGIARGS=(host=127.0.0.1 port=8090) #FCGIARGS=(socket=/run/parabolaweb.sock) -- cgit v1.2.3