From 3106a5e3651d707b616d72ac3f5e432901d3631f Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 30 Dec 2018 13:04:51 -0600 Subject: [PATCH] #4660 use greadlink from homebrew on osx for deployment --- package/deploy/sftp-symlink.sh | 8 +++++++- package/osx/travis-build-main.sh | 1 + package/osx/travis-deploy-main.sh | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/deploy/sftp-symlink.sh b/package/deploy/sftp-symlink.sh index d88c0638df..a8d62ba0d6 100755 --- a/package/deploy/sftp-symlink.sh +++ b/package/deploy/sftp-symlink.sh @@ -12,6 +12,12 @@ EXT=$1 shift FILES=$* +if [ -z ${READLINK+x} ]; then + READLINK_BIN=readlink +else + READLINK_BIN=$READLINK +fi + source $(dirname $0)/../common/util.sh set_pr_id set_branch @@ -21,7 +27,7 @@ fi if [ -s $KEY ]; then for i in $FILES; do - filepath=$(readlink -f "$i") + filepath=$(${READLINK_BIN} -f "$i") filepath=$(basename $filepath) tmpfile=$(mktemp) diff --git a/package/osx/travis-build-main.sh b/package/osx/travis-build-main.sh index 18049e315e..c863476c5c 100755 --- a/package/osx/travis-build-main.sh +++ b/package/osx/travis-build-main.sh @@ -11,6 +11,7 @@ brew install boost || brew upgrade boost brew install perl || brew upgrade perl brew install cpanminus || brew upgrade cpanminus brew install wxwidgets || brew upgrade wxwidgets +brew install greadlink || brew upgrade greadlink brew link --overwrite perl cpanminus export SLIC3R_STATIC=1 diff --git a/package/osx/travis-deploy-main.sh b/package/osx/travis-deploy-main.sh index 71439a4365..6cfdca29f2 100755 --- a/package/osx/travis-deploy-main.sh +++ b/package/osx/travis-deploy-main.sh @@ -3,4 +3,4 @@ set -euo pipefail package/osx/make_dmg.sh package/deploy/sftp.sh mac ~/slic3r-upload.rsa `pwd`/slic3r*.dmg -package/deploy/sftp-symlink.sh mac ~/slic3r-upload.rsa dmg *.dmg +READLINK=greadlink package/deploy/sftp-symlink.sh mac ~/slic3r-upload.rsa dmg *.dmg