Adjusted and normalized names

This commit is contained in:
Joseph Lenox 2017-03-05 21:53:43 -08:00
parent 3eb15bd2c4
commit 63f66314c8
2 changed files with 4 additions and 3 deletions

View File

@ -18,9 +18,10 @@ else
fi fi
file=$1 file=$1
echo "Deploying $file to $version on Bintray..."
API=${BINTRAY_API_KEY} 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) 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)

View File

@ -26,10 +26,10 @@ fi
# If we're on a branch, add the branch name to the app name. # 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 if [ "$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!')" == "master" ]; then
appname=Slic3r appname=Slic3r
dmgfile=${1}.dmg dmgfile=slic3r-${SLIC3R_BUILD_ID}-${1}.dmg
else else
appname=Slic3r-$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!') 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 fi
rm -rf $WD/_tmp rm -rf $WD/_tmp
mkdir -p $WD/_tmp mkdir -p $WD/_tmp