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