sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Factor out error behavior in dib-lint"

Browse Source
This commit is contained in:
Jenkins 2014-06-23 09:38:04 +00:00 committed by Gerrit Code Review
commit 5dfb4b5c93
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bin/dib-lint
View File

@ -39,6 +39,11 @@ excluded() {
return 1 return 1
} }
error() {
echo "ERROR: $1"
rc=1
}
rc=0 rc=0
TMPDIR=$(mktemp -d) TMPDIR=$(mktemp -d)
trap "rm -rf $TMPDIR" EXIT trap "rm -rf $TMPDIR" EXIT
@ -48,14 +53,12 @@ for i in $(find elements -type f); do
firstline=$(head -n 1 "$i") firstline=$(head -n 1 "$i")
if [ "${firstline:0:2}" = "#!" ]; then if [ "${firstline:0:2}" = "#!" ]; then
if [ ! -x "$i" ] && ! excluded executable; then if [ ! -x "$i" ] && ! excluded executable; then
echo "ERROR: $i is not executable" error "$i is not executable"
rc=1
fi fi
# Ensure 4 spaces indent are used # Ensure 4 spaces indent are used
if grep -q "^ \{4\}* \{1,3\}[^ ]" ${i}; then if grep -q "^ \{4\}* \{1,3\}[^ ]" ${i}; then
echo "ERROR: $i should use 4 spaces indent" error "$i should use 4 spaces indent"
rc=1
fi fi
fi fi
@ -67,8 +70,7 @@ for i in $(find elements -type f); do
sort ${UNSORTED} > ${SORTED} sort ${UNSORTED} > ${SORTED}
diff -c ${UNSORTED} ${SORTED} diff -c ${UNSORTED} ${SORTED}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: $i is not sorted alphabetically" error "$i is not sorted alphabetically"
rc=1
fi fi
fi fi
@ -84,20 +86,17 @@ for i in $(find elements -type f); do
if [ -n "$(echo $firstline | grep '#!/bin/bash')" ]; then if [ -n "$(echo $firstline | grep '#!/bin/bash')" ]; then
if ! excluded sete; then if ! excluded sete; then
if [ -z "$(grep "^set -[^ ]*e" $i)" ]; then if [ -z "$(grep "^set -[^ ]*e" $i)" ]; then
echo "ERROR: $i is not set -e" error "$i is not set -e"
rc=1
fi fi
fi fi
if ! excluded setu; then if ! excluded setu; then
if [ -z "$(grep "^set -[^ ]*u" $i)" ]; then if [ -z "$(grep "^set -[^ ]*u" $i)" ]; then
echo "ERROR: $i is not set -u" error "$i is not set -u"
rc=1
fi fi
fi fi
if ! excluded setpipefail; then if ! excluded setpipefail; then
if [ -z "$(grep "^set -o pipefail" $i)" ]; then if [ -z "$(grep "^set -o pipefail" $i)" ]; then
echo "ERROR: $i is not set -o pipefail" error "$i is not set -o pipefail"
rc=1
fi fi
fi fi
fi fi
@ -106,12 +105,11 @@ done
for i in $(find elements -type f -and -name '*.md' -or -type f -executable); do for i in $(find elements -type f -and -name '*.md' -or -type f -executable); do
# Check for tab indentation # Check for tab indentation
if grep -q $'^ *\t' ${i}; then if grep -q $'^ *\t' ${i}; then
echo "ERROR: $i contains tab characters" error "$i contains tab characters"
rc=1
fi fi
if [ "$(tail -c 1 $i)" != "" ]; then if [ "$(tail -c 1 $i)" != "" ]; then
echo "ERROR: No newline at end of file: $i" error "No newline at end of file: $i"
fi fi
done done
exit $rc exit $rc