travis: dedent a few scripts that are indented overly deeply

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 067e6eb702865024cf3d54d16c66019bcd930cd5..a29246af3580dc9ef7af584cb53a2fc6e084d09a 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -5,33 +5,36 @@
 
 . ${0%/*}/lib-travisci.sh
 
 
 . ${0%/*}/lib-travisci.sh
 

+P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
+LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
+

 case "${TRAVIS_OS_NAME:-linux}" in
 case "${TRAVIS_OS_NAME:-linux}" in

-       linux)
-               export GIT_TEST_HTTPD=YesPlease
+linux)
+       export GIT_TEST_HTTPD=YesPlease

 
 

-               mkdir --parents custom/p4
-               pushd custom/p4
-                       wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d
-                       wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4
-                       chmod u+x p4d
-                       chmod u+x p4
-                       export PATH="$(pwd):$PATH"
-               popd
-               mkdir --parents custom/git-lfs
-               pushd custom/git-lfs
-                       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
-                       tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
-                       cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
-                       export PATH="$(pwd):$PATH"
-               popd
+       mkdir --parents custom/p4
+       pushd custom/p4
+               wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
+               wget --quiet "$P4WHENCE/bin.linux26x86_64/p4"
+               chmod u+x p4d
+               chmod u+x p4
+               export PATH="$(pwd):$PATH"
+       popd
+       mkdir --parents custom/git-lfs
+       pushd custom/git-lfs
+               wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
+               tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
+               cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
+               export PATH="$(pwd):$PATH"
+       popd

        ;;
        ;;

-       osx)
-               brew update --quiet
-               # Uncomment this if you want to run perf tests:
-               # brew install gnu-time
-               brew install git-lfs gettext
-               brew link --force gettext
-               brew install caskroom/cask/perforce
+osx)
+       brew update --quiet
+       # Uncomment this if you want to run perf tests:
+       # brew install gnu-time
+       brew install git-lfs gettext
+       brew link --force gettext
+       brew install caskroom/cask/perforce

        ;;
 esac
 
        ;;
 esac
 

diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh
index 8583e6183983470b7d7f4ee3a298d8133907039b..8c8973cbf365ed18c1a20b81ec2bcd4a873f62b7 100755 (executable)
--- a/ci/print-test-failures.sh
+++ b/ci/print-test-failures.sh
@@ -6,13 +6,13 @@
 . ${0%/*}/lib-travisci.sh
 
 for TEST_EXIT in t/test-results/*.exit
 . ${0%/*}/lib-travisci.sh
 
 for TEST_EXIT in t/test-results/*.exit

-       do
-               if [ "$(cat "$TEST_EXIT")" != "0" ]
-               then
-                       TEST_OUT="${TEST_EXIT%exit}out"
-                       echo "------------------------------------------------------------------------"
-                       echo "$(tput setaf 1)${TEST_OUT}...$(tput sgr0)"
-                       echo "------------------------------------------------------------------------"
-                       cat "${TEST_OUT}"
-               fi
+do
+       if [ "$(cat "$TEST_EXIT")" != "0" ]
+       then
+               TEST_OUT="${TEST_EXIT%exit}out"
+               echo "------------------------------------------------------------------------"
+               echo "$(tput setaf 1)${TEST_OUT}...$(tput sgr0)"
+               echo "------------------------------------------------------------------------"
+               cat "${TEST_OUT}"
+       fi

 done
 done