From 78fdd988f44a82ae3d51da53c5314e485e566ff0 Mon Sep 17 00:00:00 2001 From: Seth Schoen Date: Tue, 14 Dec 2010 15:57:42 -0800 Subject: [PATCH] move validation before uncommitted check because validation output is too long --- makexpi.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/makexpi.sh b/makexpi.sh index 84ce9cea3..d5f9e1088 100755 --- a/makexpi.sh +++ b/makexpi.sh @@ -25,6 +25,14 @@ APP_NAME=https-everywhere cd "$(dirname $0)" +if ./trivial-validate src/chrome/content/rules >&2 +then + echo Validation of included rulesets completed. >&2 +else + echo ERROR: Validation of rulesets failed. >&2 + exit 1 +fi + if [ -n "$1" ] && [ "$1" != "uncommitted" ]; then VERSION="$1" TARG="$1" @@ -41,14 +49,6 @@ WARNING: Or, use 'makexpi.sh uncommitted' to include them in the build. fi fi -if ./trivial-validate src/chrome/content/rules >&2 -then - echo Validation of included rulesets completed. >&2 -else - echo ERROR: Validation of rulesets failed. >&2 - exit 1 -fi - XPI_NAME="pkg/$APP_NAME-$VERSION.xpi" [ -d pkg ] || mkdir pkg