travis: dedent a few scripts that are indented overly deeply
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 11, 2017 at 10:18 UTC
f67242c10ddf24a14b5085b1effcbe818aa007e6
2 files changed
+36
-33
ci/install-dependencies.sh
+27
-24
@@ -5,33 +5,36 @@
5
6
. ${0%/*}/lib-travisci.sh
7
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
+
11
case "${TRAVIS_OS_NAME:-linux}" in
9
- linux)
10
- export GIT_TEST_HTTPD=YesPlease
12
+linux)
13
+ export GIT_TEST_HTTPD=YesPlease
14
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
30
;;
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
38
;;
39
esac
40
ci/print-test-failures.sh
+9
-9
@@ -6,13 +6,13 @@
6
. ${0%/*}/lib-travisci.sh
7
8
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
18
done