git.iko.soy/typeable/servant
on master help sign in
Merge pull request #147 from haskell-servant/pingu/fix-bump-versions-script
9c50804Alp Mestanogullari
scripts/bump-versions.sh+7−3
compare with master
unifiedsplit
@@ -16,7 +16,8 @@
16set -o nounset
16set -o nounset
17set -o errexit
17set -o errexit
18
18
19+DIR=$( dirname $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ))
19−. lib/common.sh
20+. "${DIR}/scripts/lib/common.sh"
20
21
21usage () {
22usage () {
22 echo " bump-versions.sh <POSITION> [-d|--dry-run]"
23 echo " bump-versions.sh <POSITION> [-d|--dry-run]"
@@ -54,8 +55,11 @@ while [ "${1:-unset}" != "unset" ] ; do
54done
55done
55
56
56if $DRY_RUN ; then
57if $DRY_RUN ; then
58+ echo "Would have bumped position ${POSITION} on these packages:"
57− bumper --dry-run -"$POSITION" $(join , "${SOURCES[@]}")
59+ ( cd "$ROOT" && bumper --dry-run -"$POSITION" $(join , "${SOURCES[@]}") )
58else
60else
59− bumper -"$POSITION" $(join , "${SOURCES[@]}")
61+ ( cd "$ROOT" && bumper -"$POSITION" $(join , "${SOURCES[@]}") )
60fi
62fi
61
63
64+# Trailing newline, bumper does not ship with its own.
65+echo
scripts/lib/common.sh+2−1
@@ -11,6 +11,7 @@
11
11
12
12
13DIR=$( dirname $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ))
13DIR=$( dirname $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ))
14+ROOT=$( dirname $DIR )
14DRY_RUN=false
15DRY_RUN=false
15POSITION="none"
16POSITION="none"
16SOURCES_TXT="$( dirname $DIR)/sources.txt"
17SOURCES_TXT="$( dirname $DIR)/sources.txt"
@@ -23,7 +24,7 @@ readarray -t SOURCES < "$SOURCES_TXT"
23join () { local IFS="$1"; shift; echo "$*"; }
24join () { local IFS="$1"; shift; echo "$*"; }
24
25
25versions_equal () {
26versions_equal () {
26− local NUM=$(find . -name 'servant*.cabal' | xargs grep "^version:" | awk '{ print $2 }' | uniq -c | wc -l)
27+ local NUM=$(cd "$ROOT" && find . -name 'servant*.cabal' | xargs grep "^version:" | awk '{ print $2 }' | uniq -c | wc -l)
27 if [ 1 -eq $NUM ] ; then
28 if [ 1 -eq $NUM ] ; then
28 return 0
29 return 0
29 else
30 else