Skip to content

Commit 08aea3c

Browse files
committed
Use POSIX test(1)
1 parent 29e4ab1 commit 08aea3c

File tree

1 file changed

+45
-45
lines changed

1 file changed

+45
-45
lines changed

autorevision

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ while getopts ":t:o:s:Vf" OPTION; do
7474
esac
7575
done
7676

77-
if [[ ! -z "${VAROUT}" ]] && [[ ! -z "${AFILETYPE}" ]]; then
77+
if [ ! -z "${VAROUT}" ] && [ ! -z "${AFILETYPE}" ]; then
7878
# If both -s and -t are specified:
7979
echo "error: Improper argument combination." 1>&2
8080
exit 1
81-
elif [[ -z "${VAROUT}" ]] && [[ -z "${AFILETYPE}" ]]; then
81+
elif [ -z "${VAROUT}" ] && [ -z "${AFILETYPE}" ]; then
8282
# If neither -s or -t are specified:
8383
arUsage
84-
elif [[ -z "${CACHEFILE}" ]] && [[ "${CACHEFORCE}" = "1" ]]; then
84+
elif [ -z "${CACHEFILE}" ] && [ "${CACHEFORCE}" = "1" ]; then
8585
# If -f is specified without -o:
8686
arUsage
8787
fi
@@ -102,7 +102,7 @@ gitRepo() {
102102

103103
# Enumeration of changesets
104104
VCS_NUM="$(git rev-list --count HEAD 2>/dev/null)"
105-
if [[ -z "${VCS_NUM}" ]]; then
105+
if [ -z "${VCS_NUM}" ]; then
106106
echo "warning: Counting the number of revisions may be slower due to an outdated git version less than 1.7.2.3. If something breaks, please update it." 1>&2
107107
VCS_NUM="$(git rev-list HEAD | wc -l)"
108108
fi
@@ -123,7 +123,7 @@ gitRepo() {
123123
VCS_TAG="$(echo "${DESCRIPTION}" | sed -e "s:-g${VCS_SHORT_HASH}\$::" | sed -e 's:-[0-9]*$::')"
124124

125125
# Distance to last tag or an alias of VCS_NUM if there is no tag
126-
if [[ ! -z "${DESCRIPTION}" ]]; then
126+
if [ ! -z "${DESCRIPTION}" ]; then
127127
VCS_TICK="$(echo "${DESCRIPTION}" | sed -e "s:${VCS_TAG}-::" -e "s:-g${VCS_SHORT_HASH}::")"
128128
else
129129
VCS_TICK="${VCS_NUM}"
@@ -158,15 +158,15 @@ hgRepo() {
158158
# or branch if no bookmark
159159
VCS_BRANCH="$(hg id -B | cut -d ' ' -f 1)"
160160
# Fall back to the branch if there are no bookmarks
161-
if [[ -z "${VCS_BRANCH}" ]]; then
161+
if [ -z "${VCS_BRANCH}" ]; then
162162
VCS_BRANCH="$(hg id -b)"
163163
fi
164164

165165
# Current or last tag ancestor (excluding auto tags, empty if no tags)
166166
VCS_TAG="$(hg log -r "${VCS_NUM}" -l 1 --template '{latesttag}\n' 2>/dev/null | sed -e 's:qtip::' -e 's:tip::' -e 's:qbase::' -e 's:qparent::' -e "s:$(hg --config 'extensions.color=' --color never qtop 2>/dev/null)::" | cut -d ' ' -f 1)"
167167

168168
# Distance to last tag or an alias of VCS_NUM if there is no tag
169-
if [[ ! -z "${VCS_TAG}" ]]; then
169+
if [ ! -z "${VCS_TAG}" ]; then
170170
VCS_TICK="$(hg log -r "${VCS_NUM}" -l 1 --template '{latesttagdistance}\n' 2>/dev/null)"
171171
else
172172
VCS_TICK="${VCS_NUM}"
@@ -204,7 +204,7 @@ bzrRepo() {
204204
VCS_TAG="$(bzr tags --sort=time | sed '/?$/d' | tail -n1 | cut -d ' ' -f1)"
205205

206206
# Distance to last tag or an alias of VCS_NUM if there is no tag
207-
if [[ ! -z "${VCS_TAG}" ]]; then
207+
if [ ! -z "${VCS_TAG}" ]; then
208208
VCS_TICK="$(bzr log --line -r "tag:${VCS_TAG}.." | tail -n +2 | wc -l | sed -e 's:^ *::')"
209209
else
210210
VCS_TICK="${VCS_NUM}"
@@ -215,17 +215,17 @@ bzrRepo() {
215215
}
216216

217217
# For svn repos
218-
function svnRepo {
218+
svnRepo() {
219219
VCS_TYPE="svn"
220220

221221
case "${PWD}" in
222222
/*trunk*|/*branches*|/*tags*)
223223
fn="${PWD}"
224-
while [[ "$(basename "${fn}")" != 'trunk' ]] && [[ "$(basename "${fn}")" != 'branches' ]] && [[ "$(basename "${fn}")" != 'tags' ]] && [[ "$(basename "${fn}")" != '/' ]]; do
224+
while [ "$(basename "${fn}")" != 'trunk' ] && [ "$(basename "${fn}")" != 'branches' ] && [ "$(basename "${fn}")" != 'tags' ] && [ "$(basename "${fn}")" != '/' ]; do
225225
fn="$(dirname "${fn}")"
226226
done
227227
fn="$(dirname "${fn}")"
228-
if [[ "${fn}" == '/' ]]; then
228+
if [ "${fn}" == '/' ]; then
229229
VCS_BASENAME="$(basename "${PWD}")"
230230
else
231231
VCS_BASENAME="$(basename "${fn}")"
@@ -261,13 +261,13 @@ function svnRepo {
261261
while :
262262
do
263263
base="$(basename "${fn}")"
264-
if [[ "${base}" = 'trunk' ]]; then
264+
if [ "${base}" = 'trunk' ]; then
265265
VCS_BRANCH='trunk'
266266
break
267-
elif [[ "${base}" = 'branches' ]] || [[ "${base}" = 'tags' ]]; then
267+
elif [ "${base}" = 'branches' ] || [ "${base}" = 'tags' ]; then
268268
VCS_BRANCH="${lastbase}"
269269
break
270-
elif [[ "${base}" = '/' ]]; then
270+
elif [ "${base}" = '/' ]; then
271271
VCS_BRANCH=""
272272
break
273273
fi
@@ -598,18 +598,18 @@ EOF
598598

599599

600600
# Detect and collect repo data.
601-
if [[ -f "${CACHEFILE}" ]] && [[ "${CACHEFORCE}" = "1" ]]; then
601+
if [ -f "${CACHEFILE}" ] && [ "${CACHEFORCE}" = "1" ]; then
602602
# When requested only read from the cache to populate our symbols.
603603
source "${CACHEFILE}"
604-
elif [[ ! -z "$(git rev-parse HEAD 2>/dev/null)" ]]; then
604+
elif [ ! -z "$(git rev-parse HEAD 2>/dev/null)" ]; then
605605
gitRepo
606-
elif [[ ! -z "$(hg root 2>/dev/null)" ]]; then
606+
elif [ ! -z "$(hg root 2>/dev/null)" ]; then
607607
hgRepo
608-
elif [[ ! -z "$(bzr root 2>/dev/null)" ]]; then
608+
elif [ ! -z "$(bzr root 2>/dev/null)" ]; then
609609
bzrRepo
610-
elif [[ ! -z "$(svn info 2>/dev/null)" ]]; then
610+
elif [ ! -z "$(svn info 2>/dev/null)" ]; then
611611
svnRepo
612-
elif [[ -f "${CACHEFILE}" ]]; then
612+
elif [ -f "${CACHEFILE}" ]; then
613613
# We are not in a repo; try to use a previously generated cache to populate our symbols.
614614
source "${CACHEFILE}"
615615
else
@@ -619,56 +619,56 @@ fi
619619

620620

621621
# -s output is handled here.
622-
if [[ ! -z "${VAROUT}" ]]; then
623-
if [[ "${VAROUT}" = "VCS_TYPE" ]]; then
622+
if [ ! -z "${VAROUT}" ]; then
623+
if [ "${VAROUT}" = "VCS_TYPE" ]; then
624624
echo "${VCS_TYPE}"
625-
elif [[ "${VAROUT}" = "VCS_BASENAME" ]]; then
625+
elif [ "${VAROUT}" = "VCS_BASENAME" ]; then
626626
echo "${VCS_BASENAME}"
627-
elif [[ "${VAROUT}" = "VCS_NUM" ]]; then
627+
elif [ "${VAROUT}" = "VCS_NUM" ]; then
628628
echo "${VCS_NUM}"
629-
elif [[ "${VAROUT}" = "VCS_DATE" ]]; then
629+
elif [ "${VAROUT}" = "VCS_DATE" ]; then
630630
echo "${VCS_DATE}"
631-
elif [[ "${VAROUT}" = "VCS_BRANCH" ]]; then
631+
elif [ "${VAROUT}" = "VCS_BRANCH" ]; then
632632
echo "${VCS_BRANCH}"
633-
elif [[ "${VAROUT}" = "VCS_TAG" ]]; then
633+
elif [ "${VAROUT}" = "VCS_TAG" ]; then
634634
echo "${VCS_TAG}"
635-
elif [[ "${VAROUT}" = "VCS_TICK" ]]; then
635+
elif [ "${VAROUT}" = "VCS_TICK" ]; then
636636
echo "${VCS_TICK}"
637-
elif [[ "${VAROUT}" = "VCS_FULL_HASH" ]]; then
637+
elif [ "${VAROUT}" = "VCS_FULL_HASH" ]; then
638638
echo "${VCS_FULL_HASH}"
639-
elif [[ "${VAROUT}" = "VCS_SHORT_HASH" ]]; then
639+
elif [ "${VAROUT}" = "VCS_SHORT_HASH" ]; then
640640
echo "${VCS_SHORT_HASH}"
641-
elif [[ "${VAROUT}" = "VCS_WC_MODIFIED" ]]; then
641+
elif [ "${VAROUT}" = "VCS_WC_MODIFIED" ]; then
642642
echo "${VCS_WC_MODIFIED}"
643643
fi
644644
fi
645645

646646

647647
# Detect requested output type and use it.
648-
if [[ ! -z "${AFILETYPE}" ]]; then
649-
if [[ "${AFILETYPE}" = "h" ]]; then
648+
if [ ! -z "${AFILETYPE}" ]; then
649+
if [ "${AFILETYPE}" = "h" ]; then
650650
hOutput
651-
elif [[ "${AFILETYPE}" = "xcode" ]]; then
651+
elif [ "${AFILETYPE}" = "xcode" ]; then
652652
xcodeOutput
653-
elif [[ "${AFILETYPE}" = "sh" ]]; then
653+
elif [ "${AFILETYPE}" = "sh" ]; then
654654
shOutput
655-
elif [[ "${AFILETYPE}" = "py" ]]; then
655+
elif [ "${AFILETYPE}" = "py" ]; then
656656
pyOutput
657-
elif [[ "${AFILETYPE}" = "pl" ]]; then
657+
elif [ "${AFILETYPE}" = "pl" ]; then
658658
plOutput
659-
elif [[ "${AFILETYPE}" = "lua" ]]; then
659+
elif [ "${AFILETYPE}" = "lua" ]; then
660660
luaOutput
661-
elif [[ "${AFILETYPE}" = "php" ]]; then
661+
elif [ "${AFILETYPE}" = "php" ]; then
662662
phpOutput
663-
elif [[ "${AFILETYPE}" = "ini" ]]; then
663+
elif [ "${AFILETYPE}" = "ini" ]; then
664664
iniOutput
665-
elif [[ "${AFILETYPE}" = "js" ]]; then
665+
elif [ "${AFILETYPE}" = "js" ]; then
666666
jsOutput
667-
elif [[ "${AFILETYPE}" = "java" ]]; then
667+
elif [ "${AFILETYPE}" = "java" ]; then
668668
javaOutput
669-
elif [[ "${AFILETYPE}" = "javaprop" ]]; then
669+
elif [ "${AFILETYPE}" = "javaprop" ]; then
670670
javapropOutput
671-
elif [[ "${AFILETYPE}" = "tex" ]]; then
671+
elif [ "${AFILETYPE}" = "tex" ]; then
672672
texOutput
673673
else
674674
echo "error: Not a valid output type." 1>&2
@@ -678,7 +678,7 @@ fi
678678

679679

680680
# If requested, make a cache file.
681-
if [[ ! -z "${CACHEFILE}" ]] && [[ ! "${CACHEFORCE}" = "1" ]]; then
681+
if [ ! -z "${CACHEFILE}" ] && [ ! "${CACHEFORCE}" = "1" ]; then
682682
TARGETFILE="${CACHEFILE}"
683683
shOutput
684684
fi

0 commit comments

Comments
 (0)