x
/
cloud-init
Code Issues Proposed changes

better checking and portability in read-dependencies and read-version

This commit is contained in:
Scott Moser 2013-09-11 13:27:40 -04:00
parent 843d099752
commit 949fb98df7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/read-dependencies
View File

@ -26,6 +26,7 @@ if [ ! -e "$REQUIRES" ]; then
fi
# Filter out comments and empty lines
DEPS=$(sed -n -e 's,#.*,,' -e '/./p' "$REQUIRES") ||
DEPS=$(sed -n -e 's,#.*,,' -e '/./p' "$REQUIRES") &&
[ -n "$DEPS" ] ||
fail "failed to read deps from '${REQUIRES}'"
echo "$DEPS" | sort -d -f

5
tools/read-version
View File

@ -25,7 +25,8 @@ if [ ! -e "$CHNG_LOG" ]; then
fail "Unable to find 'ChangeLog' file located at '$CHNG_LOG'"
fi
VERSION=$(sed -n '/^[0-9]\+[.][0-9]\+[.][0-9]\+:/ {s/://; p; :a;n; ba}' \
"$CHNG_LOG") ||
VERSION=$(sed -n '/^[0-9]\+[.][0-9]\+[.][0-9]\+:/ \
{s/://; p; :a;n; ba; }' "$CHNG_LOG") &&
[ -n "$VERSION" ] ||
fail "failed to get version from '$CHNG_LOG'"
echo "$VERSION"