Update Travis.

This commit is contained in:
Markus F.X.J. Oberhumer 2017-05-04 17:35:56 +02:00
parent 61798d33f0
commit ddf48b45a5
3 changed files with 13 additions and 1 deletions

View File

@ -158,6 +158,7 @@ git ls-files -v
umask 077
[[ -d ~/.ssh ]] || mkdir ~/.ssh
fix_home_ssh_perms
repo=$(git config remote.origin.url)
ssh_repo=${repo/https:\/\/github.com\//git@github.com:}
eval $(ssh-agent -s)
@ -166,7 +167,9 @@ openssl aes-256-cbc -d -a -K "$UPX_AUTOMATIC_BUILDS_SSL_KEY" -iv "$UPX_AUTOMATIC
set -x
chmod 600 .git/deploy.key
ssh-add .git/deploy.key
fix_home_ssh_perms
ssh-keyscan -H github.com >> ~/.ssh/known_hosts
fix_home_ssh_perms
let i=0 || true
while true; do

View File

@ -244,4 +244,13 @@ print_settings() {
##env | LC_ALL=C sort
}
fix_home_ssh_perms() {
if [[ -d ~/.ssh ]]; then
if [[ -x /usr/sbin/restorecon ]]; then
/usr/sbin/restorecon -v -R ~/.ssh || true
fi
chmod -c -R go-rwx ~/.ssh || true
fi
}
true

View File

@ -44,7 +44,7 @@ testsuite_split_f() {
fb=$(basename "$1")
fsubdir=$(basename "$fd")
# sanity checks
if [[ ! -f $f || -z $fsubdir || -z $fb ]]; then
if [[ ! -f "$1" || -z "$fsubdir" || -z "$fb" ]]; then
fd= fb= fsubdir=
fi
}