mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
cc5549ca12
We had all kinds of indentation: 2 sp, 3 sp, 4 sp, 8 sp, and mixed. 4 sp was the most common, in particular the majority of scripts under test/ used that. Let's standarize on 4 sp, because many commandlines are long and there's a lot of nesting, and with 8sp indentation less stuff fits. 4 sp also seems to be the default indentation, so this will make it less likely that people will mess up if they don't load the editor config. (I think people often use vi, and vi has no support to load project-wide configuration automatically. We distribute a .vimrc file, but it is not loaded by default, and even the instructions in it seem to discourage its use for security reasons.) Also remove the few vim config lines that were left. We should either have them on all files, or none. Also remove some strange stuff like '#!/bin/env bash', yikes.
62 lines
1.6 KiB
Bash
62 lines
1.6 KiB
Bash
# This was borrowed from https://github.com/travis-ci/travis-build/tree/master/lib/travis/build/bash
|
|
# to get around https://github.com/travis-ci/travis-ci/issues/9979. It should probably be removed
|
|
# as soon as Travis CI has started to provide an easy way to export the functions to bash scripts.
|
|
|
|
travis_jigger() {
|
|
local cmd_pid="${1}"
|
|
shift
|
|
local timeout="${1}"
|
|
shift
|
|
local count=0
|
|
|
|
echo -e "\\n"
|
|
|
|
while [[ "${count}" -lt "${timeout}" ]]; do
|
|
count="$((count + 1))"
|
|
echo -ne "Still running (${count} of ${timeout}): ${*}\\r"
|
|
sleep 60
|
|
done
|
|
|
|
echo -e "\\n${ANSI_RED}Timeout (${timeout} minutes) reached. Terminating \"${*}\"${ANSI_RESET}\\n"
|
|
kill -9 "${cmd_pid}"
|
|
}
|
|
|
|
travis_wait() {
|
|
local timeout="${1}"
|
|
|
|
if [[ "${timeout}" =~ ^[0-9]+$ ]]; then
|
|
shift
|
|
else
|
|
timeout=20
|
|
fi
|
|
|
|
local cmd=("${@}")
|
|
local log_file="travis_wait_${$}.log"
|
|
|
|
"${cmd[@]}" &>"${log_file}" &
|
|
local cmd_pid="${!}"
|
|
|
|
travis_jigger "${!}" "${timeout}" "${cmd[@]}" &
|
|
local jigger_pid="${!}"
|
|
local result
|
|
|
|
{
|
|
set +e
|
|
wait "${cmd_pid}" 2>/dev/null
|
|
result="${?}"
|
|
ps -p"${jigger_pid}" &>/dev/null && kill "${jigger_pid}"
|
|
set -e
|
|
}
|
|
|
|
if [[ "${result}" -eq 0 ]]; then
|
|
echo -e "\\n${ANSI_GREEN}The command ${cmd[*]} exited with ${result}.${ANSI_RESET}"
|
|
else
|
|
echo -e "\\n${ANSI_RED}The command ${cmd[*]} exited with ${result}.${ANSI_RESET}"
|
|
fi
|
|
|
|
echo -e "\\n${ANSI_GREEN}Log:${ANSI_RESET}\\n"
|
|
cat "${log_file}"
|
|
|
|
return "${result}"
|
|
}
|