#4660 use greadlink from homebrew on osx for deployment

slic3r · Dec 30, 2018 · ba6a91a · ba6a91a
1 parent 8f51287
commit ba6a91a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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