Skip to content

Commit f67242c

Browse files
committed
travis: dedent a few scripts that are indented overly deeply
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 09f5e97 commit f67242c

File tree

2 files changed

+36
-33
lines changed

2 files changed

+36
-33
lines changed

ci/install-dependencies.sh

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,36 @@
55

66
. ${0%/*}/lib-travisci.sh
77

8+
P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
9+
LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
10+
811
case "${TRAVIS_OS_NAME:-linux}" in
9-
linux)
10-
export GIT_TEST_HTTPD=YesPlease
12+
linux)
13+
export GIT_TEST_HTTPD=YesPlease
1114

12-
mkdir --parents custom/p4
13-
pushd custom/p4
14-
wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d
15-
wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4
16-
chmod u+x p4d
17-
chmod u+x p4
18-
export PATH="$(pwd):$PATH"
19-
popd
20-
mkdir --parents custom/git-lfs
21-
pushd custom/git-lfs
22-
wget --quiet https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz
23-
tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
24-
cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
25-
export PATH="$(pwd):$PATH"
26-
popd
15+
mkdir --parents custom/p4
16+
pushd custom/p4
17+
wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
18+
wget --quiet "$P4WHENCE/bin.linux26x86_64/p4"
19+
chmod u+x p4d
20+
chmod u+x p4
21+
export PATH="$(pwd):$PATH"
22+
popd
23+
mkdir --parents custom/git-lfs
24+
pushd custom/git-lfs
25+
wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
26+
tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
27+
cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
28+
export PATH="$(pwd):$PATH"
29+
popd
2730
;;
28-
osx)
29-
brew update --quiet
30-
# Uncomment this if you want to run perf tests:
31-
# brew install gnu-time
32-
brew install git-lfs gettext
33-
brew link --force gettext
34-
brew install caskroom/cask/perforce
31+
osx)
32+
brew update --quiet
33+
# Uncomment this if you want to run perf tests:
34+
# brew install gnu-time
35+
brew install git-lfs gettext
36+
brew link --force gettext
37+
brew install caskroom/cask/perforce
3538
;;
3639
esac
3740

ci/print-test-failures.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
. ${0%/*}/lib-travisci.sh
77

88
for TEST_EXIT in t/test-results/*.exit
9-
do
10-
if [ "$(cat "$TEST_EXIT")" != "0" ]
11-
then
12-
TEST_OUT="${TEST_EXIT%exit}out"
13-
echo "------------------------------------------------------------------------"
14-
echo "$(tput setaf 1)${TEST_OUT}...$(tput sgr0)"
15-
echo "------------------------------------------------------------------------"
16-
cat "${TEST_OUT}"
17-
fi
9+
do
10+
if [ "$(cat "$TEST_EXIT")" != "0" ]
11+
then
12+
TEST_OUT="${TEST_EXIT%exit}out"
13+
echo "------------------------------------------------------------------------"
14+
echo "$(tput setaf 1)${TEST_OUT}...$(tput sgr0)"
15+
echo "------------------------------------------------------------------------"
16+
cat "${TEST_OUT}"
17+
fi
1818
done

0 commit comments

Comments
 (0)