Skip to content

Commit 7060af1

Browse files
Merge pull request #322 from BernhardWebstudio/master
Fix #321: build fails on MacOS
2 parents 4786a8e + 69498e9 commit 7060af1

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.travis.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,22 @@ perl:
1313
matrix:
1414
include:
1515
- os: osx
16-
osx_image: xcode7.3
16+
osx_image: xcode9.4
1717
language: generic
1818
perl: 5.24
1919
allow_failures:
2020
- perl: "blead"
2121

22+
addons:
23+
homebrew:
24+
packages:
25+
- perl
26+
- shellcheck
27+
- cpanminus
28+
2229
before_install:
2330
- git clone --depth 1 https://github.com/sstephenson/bats.git
2431
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
25-
brew update;
26-
brew install shellcheck perl cpanminus;
2732
mkdir -p ~/perl5;
2833
fi
2934
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

report-bug.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ clipboard() {
2323
copy_cmd=clip
2424
fi
2525
# copy_cmd=clip
26-
elif which pbcopy >/dev/null 2>&1; then
26+
elif command -v pbcopy >/dev/null 2>&1; then
2727
copy_cmd="pbcopy"
28-
elif which xclip >/dev/null 2>&1; then
28+
elif command -v xclip >/dev/null 2>&1; then
2929
# copy_cmd="xclip -i -selection clipboard"
3030
copy_cmd="xclip"
31-
elif which xsel >/dev/null 2>&1 ; then
31+
elif command -v xsel >/dev/null 2>&1 ; then
3232
local copy_cmd="xsel -b"
3333
fi
3434
if [ -n "$copy_cmd" ] ;then

0 commit comments

Comments
 (0)