From 9dd1f24b15959c25abe2d3d1d21441b973b20e52 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sat, 4 Mar 2017 21:06:57 -0800 Subject: [PATCH 01/13] package Slic3r for OSX post-build. --- package/osx/make_dmg.sh | 76 +++++++++++++++++++++++++++++++++++ package/osx/plist.sh | 39 ++++++++++++++++++ package/osx/startup_script.sh | 4 ++ 3 files changed, 119 insertions(+) create mode 100755 package/osx/make_dmg.sh create mode 100644 package/osx/plist.sh create mode 100644 package/osx/startup_script.sh diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh new file mode 100755 index 000000000..767427c7e --- /dev/null +++ b/package/osx/make_dmg.sh @@ -0,0 +1,76 @@ +#!/bin/bash + +# Assembles an installation bundle from a built copy of Slic3r. +# Required environment variables: +# Adapted from script written by bubnikv for Prusa3D. +# SLIC3R_VERSION - x.x.x format + +WD=$(dirname $0) +# Determine if this is a tagged (release) commit. +# Change the build id accordingly. +if [ $(git describe &>/dev/null) ]; then + TAGGED=true + SLIC3R_BUILD_ID=$(git describe) +else + TAGGED=false + SLIC3R_BUILD_ID=${SLIC3R_VERSION}d +fi + +# If we're on a branch, add the branch name to the app name. +if [ "$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!')" == "master" ]; then + appname=Slic3r + dmgfile=${1}.dmg +else + appname=Slic3r-$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!') + dmgfile=${1}-$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!').dmg +fi + +# OSX Application folder shenanigans. +appfolder="$WD/${appname}.app" +macosfolder=$appfolder/Contents/MacOS +resourcefolder=$appfolder/Contents/Resources +plistfile=$appfolder/Contents/Info.plist +PkgInfoContents="APPL????" +source $WD/plist.sh + +# Our slic3r dir and location of perl +PERL_BIN=$(which perl) +SLIC3R_DIR="${WD}/../../" + +if [[ -d "${appfolder}" ]]; then + echo "Deleting old working folder." + rm -rf ${appfolder} +fi + +if [[ -d "${dmgfile}" ]]; then + echo "Deleting old dmg ${dmgfile}." + rm -rf ${dmgfile} +fi + +echo "Creating new app folder at $appfolder." +mkdir -p $appfolder +mkdir -p $macosfolder +mkdir -p $resourcefolder + +echo "Copying resources..." +cp -r $SLIC3R_DIR/var $macosfolder/ +mv $macosfolder/var/Slic3r.icns $resourcefolder + +echo "Copying Slic3r..." +cp $SLIC3R_DIR/slic3r.pl $macosfolder/slic3r.pl +cp -r $SLIC3R_DIR/local-lib $macosfolder/local-lib +cp -r $SLIC3R_DIR/lib/* $macosfolder/local-lib/lib/perl5/ + +echo "Copying startup script..." +cp $WD/startup_script.sh $macosfolder/$appname +chmod +x $macosfolder/$appname + +echo "Copying perl from $PERL_BIN" +cp $PERL_BIN $macosfolder + +make_plist + +echo $PkgInfoContents >$appfolder/Contents/PkgInfo + +echo "Creating dmg file...." +hdiutil create -fs HFS+ -srcfolder "$appfolder" -volname "$appname" "$dmgfile" diff --git a/package/osx/plist.sh b/package/osx/plist.sh new file mode 100644 index 000000000..a4768a29a --- /dev/null +++ b/package/osx/plist.sh @@ -0,0 +1,39 @@ +#!/bin/bash +function make_plist() { +# Create information property list file (Info.plist). +echo '' >$plistfile +echo '' >>$plistfile +echo '' >>$plistfile +echo '' >>$plistfile +echo ' CFBundleExecutable' >>$plistfile +echo ' '$appname'' >>$plistfile +echo ' CFBundleGetInfoString' >>$plistfile +echo " Slic3r Copyright (C) 2011-$(date +%Y) Alessandro Ranellucci" >>$plistfile +echo ' CFBundleIconFile' >>$plistfile +echo ' Slic3r.icns' >>$plistfile +echo ' CFBundleName' >>$plistfile +echo ' Slic3r' >>$plistfile +echo ' CFBundleShortVersionString' >>$plistfile +if [ $TAGGED ]; then + echo " Slic3r $SLIC3R_BUILD_ID" >>$plistfile +else + echo " Slic3r $SLIC3R_BUILD_ID-$(git rev-parse --short head)" >>$plistfile +fi +echo ' CFBundleIdentifier' >>$plistfile +echo ' ' >>$plistfile +echo ' CFBundleInfoDictionaryVersion' >>$plistfile +echo ' 6.0' >>$plistfile +echo ' CFBundlePackageType' >>$plistfile +echo ' APPL' >>$plistfile +echo ' CFBundleSignature' >>$plistfile +echo ' ????' >>$plistfile +echo ' CFBundleVersion' >>$plistfile +echo " ${SLIC3R_BUILD_ID}" >>$plistfile +echo ' CFBundleIdentifier' >>$plistfile +echo ' ' >>$plistfile +echo ' CGDisableCoalescedUpdates' >>$plistfile +echo ' ' >>$plistfile +echo '' >>$plistfile +echo '' >>$plistfile + +} diff --git a/package/osx/startup_script.sh b/package/osx/startup_script.sh new file mode 100644 index 000000000..33adc2df7 --- /dev/null +++ b/package/osx/startup_script.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +DIR=$(dirname "$0") +$DIR/perl $DIR/slic3r.pl $@ From 58932ebc5ecf139b339ef8037e93f2425d270f23 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sat, 4 Mar 2017 22:13:18 -0800 Subject: [PATCH 02/13] added more perl modules to the dmg creation via a temporary test.par --- package/osx/make_dmg.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh index 767427c7e..b2f2c86d0 100755 --- a/package/osx/make_dmg.sh +++ b/package/osx/make_dmg.sh @@ -24,6 +24,9 @@ else appname=Slic3r-$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!') dmgfile=${1}-$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!').dmg fi +rm -rf $WD/_tmp +mkdir -p $WD/_tmp + # OSX Application folder shenanigans. appfolder="$WD/${appname}.app" @@ -35,6 +38,7 @@ source $WD/plist.sh # Our slic3r dir and location of perl PERL_BIN=$(which perl) +PP_BIN=$(which pp) SLIC3R_DIR="${WD}/../../" if [[ -d "${appfolder}" ]]; then @@ -66,7 +70,15 @@ cp $WD/startup_script.sh $macosfolder/$appname chmod +x $macosfolder/$appname echo "Copying perl from $PERL_BIN" -cp $PERL_BIN $macosfolder +cp $PERL_BIN $macosfolder/perl-local +${PP_BIN} -M POSIX -M FindBin \ + -M lib -M overload \ + -M warnings -M local::lib \ + -M strict -M utf8 -M parent \ + -B -p -e "print 123" -o $WD/_tmp/test.par +unzip $WD/_tmp/test.par -d $WD/_tmp/ +cp -r $WD/_tmp/lib/* $macosfolder/local-lib/lib/perl5/ +rm -rf $WD/_tmp make_plist From 1b89084f33619bc55e2997cc6f1c6656975f25de Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sat, 4 Mar 2017 22:16:30 -0800 Subject: [PATCH 03/13] Rearranged comments and added guard to ensure only one parameter is given. --- package/osx/make_dmg.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh index b2f2c86d0..8f2b66922 100755 --- a/package/osx/make_dmg.sh +++ b/package/osx/make_dmg.sh @@ -1,10 +1,17 @@ #!/bin/bash # Assembles an installation bundle from a built copy of Slic3r. -# Required environment variables: +# Requires PAR::Packer to be installed for the version of +# perl copied. # Adapted from script written by bubnikv for Prusa3D. +# Required environment variables: # SLIC3R_VERSION - x.x.x format +if [ "$#" -ne 1 ]; then + echo "Usage: $(basename $0) dmg_name" + exit 1; +fi + WD=$(dirname $0) # Determine if this is a tagged (release) commit. # Change the build id accordingly. From fbd8075cd64c969eee062a351dda617e38e8062a Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Sun, 5 Mar 2017 10:44:40 +0100 Subject: [PATCH 04/13] Populated CFBundleIdentifier. #612 --- package/osx/plist.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/osx/plist.sh b/package/osx/plist.sh index a4768a29a..adf51861e 100644 --- a/package/osx/plist.sh +++ b/package/osx/plist.sh @@ -20,7 +20,7 @@ else echo " Slic3r $SLIC3R_BUILD_ID-$(git rev-parse --short head)" >>$plistfile fi echo ' CFBundleIdentifier' >>$plistfile -echo ' ' >>$plistfile +echo ' org.slic3r.Slic3r' >>$plistfile echo ' CFBundleInfoDictionaryVersion' >>$plistfile echo ' 6.0' >>$plistfile echo ' CFBundlePackageType' >>$plistfile @@ -29,8 +29,6 @@ echo ' CFBundleSignature' >>$plistfile echo ' ????' >>$plistfile echo ' CFBundleVersion' >>$plistfile echo " ${SLIC3R_BUILD_ID}" >>$plistfile -echo ' CFBundleIdentifier' >>$plistfile -echo ' ' >>$plistfile echo ' CGDisableCoalescedUpdates' >>$plistfile echo ' ' >>$plistfile echo '' >>$plistfile From 0c3fd13da52dbd24ee33965f756f8dac7fe5a647 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 5 Mar 2017 18:57:02 -0600 Subject: [PATCH 05/13] Added file associations to Info.plist --- package/osx/plist.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/osx/plist.sh b/package/osx/plist.sh index adf51861e..26332bc2f 100644 --- a/package/osx/plist.sh +++ b/package/osx/plist.sh @@ -29,6 +29,16 @@ echo ' CFBundleSignature' >>$plistfile echo ' ????' >>$plistfile echo ' CFBundleVersion' >>$plistfile echo " ${SLIC3R_BUILD_ID}" >>$plistfile +echo ' CFBundleTypeRole' >>$plistfile +echo ' Viewer' >>$plistfile +# Associate with a few file types (amf, stl, obj) +echo ' CFBundleTypeExtensions' >>$plistfile +echo ' ' >> $plistfile +echo ' stl ' >> $plistfile +echo ' amf ' >> $plistfile +echo ' obj ' >> $plistfile +echo ' ' >> $plistfile +echo ' LISsAppleDefaultForType ' >> $plistfile echo ' CGDisableCoalescedUpdates' >>$plistfile echo ' ' >>$plistfile echo '' >>$plistfile From 3eb15bd2c45496f04b65de76f5c0027b3e817db3 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 5 Mar 2017 21:36:04 -0800 Subject: [PATCH 06/13] added bintray deployment bash script --- package/deploy-bintray.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 package/deploy-bintray.sh diff --git a/package/deploy-bintray.sh b/package/deploy-bintray.sh new file mode 100755 index 000000000..5c581bdce --- /dev/null +++ b/package/deploy-bintray.sh @@ -0,0 +1,27 @@ +#!/bin/bash +if [ $(git describe &>/dev/null) ]; then + TAGGED=true + SLIC3R_BUILD_ID=$(git describe) + else + TAGGED=false + SLIC3R_BUILD_ID=${SLIC3R_VERSION}d-$(git rev-parse --short head) +fi + +if [ "$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!')" == "master" ]; then + # If building master, goes in slic3r_dev + SLIC3R_PKG=slic3r_dev + version=$SLIC3R_BUILD_ID +else + # If building a branch, put the package somewhere else. + SLIC3R_PKG=Slic3r_Branches + version=$SLIC3R_BUILD_ID-$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!') +fi + +file=$1 +API=${BINTRAY_API_KEY} + +curl -v -X POST -d "{ \"name\": \"$version\", \"released\": \"ISO8601 $(date +%Y-%m-%d'T'%H:%M:%S)\", \"desc\": \"This version...\", \"github_release_notes_file\": \"RELEASE.txt\", \"github_use_tag_release_notes\": true, \"vcs_tag\": \"$version\" }" -ulordofhyphens:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/slic3r_dev/versions + +curl -H "X-Bintray-Package: $SLIC3R_PKG" -H "X-Bintray-Version: $version" -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -T $file -ulordofhyphens:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/$(basename $1) + +curl -H 'Content-Type: application/json' -X PUT -d "{ \"list_in_downloads\":true }" -ulordofhyphens:${API} https://api.bintray.com/file_metadata/lordofhyphens/Slic3r/$(basename $1) From 63f66314c841be34cb518fc3f21afbf835b94131 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 5 Mar 2017 21:53:43 -0800 Subject: [PATCH 07/13] Adjusted and normalized names --- package/deploy-bintray.sh | 3 ++- package/osx/make_dmg.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/deploy-bintray.sh b/package/deploy-bintray.sh index 5c581bdce..c712560dc 100755 --- a/package/deploy-bintray.sh +++ b/package/deploy-bintray.sh @@ -18,9 +18,10 @@ else fi file=$1 +echo "Deploying $file to $version on Bintray..." API=${BINTRAY_API_KEY} -curl -v -X POST -d "{ \"name\": \"$version\", \"released\": \"ISO8601 $(date +%Y-%m-%d'T'%H:%M:%S)\", \"desc\": \"This version...\", \"github_release_notes_file\": \"RELEASE.txt\", \"github_use_tag_release_notes\": true, \"vcs_tag\": \"$version\" }" -ulordofhyphens:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/slic3r_dev/versions +curl -X POST -d "{ \"name\": \"$version\", \"released\": \"ISO8601 $(date +%Y-%m-%d'T'%H:%M:%S)\", \"desc\": \"This version...\", \"github_release_notes_file\": \"RELEASE.txt\", \"github_use_tag_release_notes\": true, \"vcs_tag\": \"$version\" }" -ulordofhyphens:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/slic3r_dev/versions curl -H "X-Bintray-Package: $SLIC3R_PKG" -H "X-Bintray-Version: $version" -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -T $file -ulordofhyphens:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/$(basename $1) diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh index 8f2b66922..2cedd4ef4 100755 --- a/package/osx/make_dmg.sh +++ b/package/osx/make_dmg.sh @@ -26,10 +26,10 @@ fi # If we're on a branch, add the branch name to the app name. if [ "$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!')" == "master" ]; then appname=Slic3r - dmgfile=${1}.dmg + dmgfile=slic3r-${SLIC3R_BUILD_ID}-${1}.dmg else appname=Slic3r-$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!') - dmgfile=${1}-$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!').dmg + dmgfile=slic3r-${SLIC3R_BUILD_ID}-${1}-$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!').dmg fi rm -rf $WD/_tmp mkdir -p $WD/_tmp From 1ea3dd7423ecf61a53c92ad4eaaad9c09e4d5174 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 6 Mar 2017 13:38:04 +0100 Subject: [PATCH 08/13] Bugfix: old DMG was not deleted --- package/osx/make_dmg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh index 2cedd4ef4..6aadfad29 100755 --- a/package/osx/make_dmg.sh +++ b/package/osx/make_dmg.sh @@ -53,7 +53,7 @@ if [[ -d "${appfolder}" ]]; then rm -rf ${appfolder} fi -if [[ -d "${dmgfile}" ]]; then +if [[ -e "${dmgfile}" ]]; then echo "Deleting old dmg ${dmgfile}." rm -rf ${dmgfile} fi From a6c03f235f05a7fbe55e2678f06dd7f611913ee5 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 6 Mar 2017 13:56:07 +0100 Subject: [PATCH 09/13] Preserve symbolic links of dylibs instead of duplicating them in the package --- package/osx/make_dmg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh index 6aadfad29..4e16adda7 100755 --- a/package/osx/make_dmg.sh +++ b/package/osx/make_dmg.sh @@ -69,8 +69,8 @@ mv $macosfolder/var/Slic3r.icns $resourcefolder echo "Copying Slic3r..." cp $SLIC3R_DIR/slic3r.pl $macosfolder/slic3r.pl -cp -r $SLIC3R_DIR/local-lib $macosfolder/local-lib -cp -r $SLIC3R_DIR/lib/* $macosfolder/local-lib/lib/perl5/ +cp -RP $SLIC3R_DIR/local-lib $macosfolder/local-lib +cp -RP $SLIC3R_DIR/lib/* $macosfolder/local-lib/lib/perl5/ echo "Copying startup script..." cp $WD/startup_script.sh $macosfolder/$appname From c6034bbddfad06ea28696afbe8e34988c20b2e8d Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 6 Mar 2017 15:45:43 +0100 Subject: [PATCH 10/13] Almost there with OS X packaging --- package/osx/make_dmg.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh index 4e16adda7..85e9fd33e 100755 --- a/package/osx/make_dmg.sh +++ b/package/osx/make_dmg.sh @@ -46,7 +46,7 @@ source $WD/plist.sh # Our slic3r dir and location of perl PERL_BIN=$(which perl) PP_BIN=$(which pp) -SLIC3R_DIR="${WD}/../../" +SLIC3R_DIR=$(perl -MCwd=realpath -e "print realpath '${WD}/../../'") if [[ -d "${appfolder}" ]]; then echo "Deleting old working folder." @@ -71,6 +71,13 @@ echo "Copying Slic3r..." cp $SLIC3R_DIR/slic3r.pl $macosfolder/slic3r.pl cp -RP $SLIC3R_DIR/local-lib $macosfolder/local-lib cp -RP $SLIC3R_DIR/lib/* $macosfolder/local-lib/lib/perl5/ +find $macosfolder/local-lib -name man -type d -delete + +echo "Relocating dylib paths..." +for bundle in $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/auto/Wx/Wx.bundle $(find $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/Alien/wxWidgets -name '*.dylib' -type f); do + chmod +w $bundle + find $SLIC3R_DIR/local-lib -name '*.dylib' -exec bash -c 'install_name_tool -change "{}" "@executable_path/local-lib/lib/perl5/darwin-thread-multi-2level/Alien/wxWidgets/osx_cocoa_3_0_2_uni/lib/$(basename {})" '$bundle \; +done echo "Copying startup script..." cp $WD/startup_script.sh $macosfolder/$appname @@ -78,7 +85,8 @@ chmod +x $macosfolder/$appname echo "Copying perl from $PERL_BIN" cp $PERL_BIN $macosfolder/perl-local -${PP_BIN} -M POSIX -M FindBin \ +${PP_BIN} -M attributes -M base -M bytes -M B -M POSIX \ + -M FindBin -M Unicode::Normalize -M Tie::Handle \ -M lib -M overload \ -M warnings -M local::lib \ -M strict -M utf8 -M parent \ From b0d2644e06e6e80268045d18b7bd8cf7eaaf3e26 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 6 Mar 2017 16:35:58 +0100 Subject: [PATCH 11/13] Pass module path to local perl --- package/osx/startup_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/osx/startup_script.sh b/package/osx/startup_script.sh index 33adc2df7..b98fa5bdc 100644 --- a/package/osx/startup_script.sh +++ b/package/osx/startup_script.sh @@ -1,4 +1,4 @@ #!/bin/bash DIR=$(dirname "$0") -$DIR/perl $DIR/slic3r.pl $@ +$DIR/perl-local -I$DIR/local-lib/lib/perl5 $DIR/slic3r.pl $@ From 7f9ca6bf994c41ce17bd013c7ae19dfaa17d1cd7 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 6 Mar 2017 16:36:57 +0100 Subject: [PATCH 12/13] Ignore .app and .dmg files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 089e0a2c0..f24586461 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ xs/MANIFEST.bak xs/assertlib* .init_bundle.ini local-lib +package/osx/Slic3r*.app +*.dmg From 2b360c66d413eea7115c28bda96cc2967f05b169 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 6 Mar 2017 16:40:18 +0100 Subject: [PATCH 13/13] Tweaked deployment script to use variables for bintray stuff, added description at top (by @lordofhyphens) --- package/deploy-bintray.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/package/deploy-bintray.sh b/package/deploy-bintray.sh index c712560dc..e1bc83620 100755 --- a/package/deploy-bintray.sh +++ b/package/deploy-bintray.sh @@ -1,9 +1,14 @@ #!/bin/bash +# Prerequistes +# Environment variables: +# BINTRAY_API_KEY - Working API key +# BINTRAY_API_USER - Bintray username. +# SLIC3R_VERSION - Development version # for Slic3r + + if [ $(git describe &>/dev/null) ]; then - TAGGED=true SLIC3R_BUILD_ID=$(git describe) - else - TAGGED=false +else SLIC3R_BUILD_ID=${SLIC3R_VERSION}d-$(git rev-parse --short head) fi @@ -20,9 +25,12 @@ fi file=$1 echo "Deploying $file to $version on Bintray..." API=${BINTRAY_API_KEY} +USER=${BINTRAY_API_USER} -curl -X POST -d "{ \"name\": \"$version\", \"released\": \"ISO8601 $(date +%Y-%m-%d'T'%H:%M:%S)\", \"desc\": \"This version...\", \"github_release_notes_file\": \"RELEASE.txt\", \"github_use_tag_release_notes\": true, \"vcs_tag\": \"$version\" }" -ulordofhyphens:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/slic3r_dev/versions +curl -X POST -d "{ \"name\": \"$version\", \"released\": \"ISO8601 $(date +%Y-%m-%d'T'%H:%M:%S)\", \"desc\": \"This version...\", \"github_release_notes_file\": \"RELEASE.txt\", \"github_use_tag_release_notes\": true, \"vcs_tag\": \"$version\" }" -u${USER}:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/${SLIC3R_PKG}/versions -curl -H "X-Bintray-Package: $SLIC3R_PKG" -H "X-Bintray-Version: $version" -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -T $file -ulordofhyphens:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/$(basename $1) +curl -H "X-Bintray-Package: $SLIC3R_PKG" -H "X-Bintray-Version: $version" -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -T $file -u${USER}:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/$(basename $1) +echo "Publishing $file..." +curl -X POST -u${USER}:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/${SLIC3R_PKG}/$version/publish -curl -H 'Content-Type: application/json' -X PUT -d "{ \"list_in_downloads\":true }" -ulordofhyphens:${API} https://api.bintray.com/file_metadata/lordofhyphens/Slic3r/$(basename $1) +curl -H 'Content-Type: application/json' -X PUT -d "{ \"list_in_downloads\":true }" -u${USER}:${API} https://api.bintray.com/file_metadata/lordofhyphens/Slic3r/$(basename $1)