From b3a848ed0042930a1f9eba4fee0ea35bf0edbf00 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sat, 1 Dec 2018 13:26:53 -0600 Subject: [PATCH] Allow for override of PERL_BIN and PP_BIN --- .travis.yml | 2 ++ package/linux/make_archive.sh | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index be96c2c2f..d6824c296 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,8 @@ matrix: env: - TARGET=main - WXDIR=$HOME/wx302 + - PERL_BIN=$HOME/perl5/perlbrew/perls/slic3r-perl/bin/perl + - PP_BIN=$HOME/perl5/perlbrew/perls/slic3r-perl/bin/pp cache: directories: - $HOME/boost_1_63_0 diff --git a/package/linux/make_archive.sh b/package/linux/make_archive.sh index ad87b2a06..9c18ea96d 100755 --- a/package/linux/make_archive.sh +++ b/package/linux/make_archive.sh @@ -46,8 +46,12 @@ resourcefolder=$appfolder echo "Appfolder: $appfolder, archivefolder: $archivefolder" # Our slic3r dir and location of perl -PERL_BIN=$(which perl) -PP_BIN=$(which pp) +if [[ ! -z "$PERL_BIN" ]]; then + PERL_BIN=$(which perl) +fi +if [[! -z "$PP_BIN" ]]; then + PP_BIN=$(which pp) +fi SLIC3R_DIR="./" if [[ -d "${appfolder}" ]]; then