GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-11 23:11:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed inverted logic in deploy, make_dmg now reads libslic3r

Browse Source
This commit is contained in:
Joseph Lenox 2017-03-06 16:19:33 -06:00
parent a69378a81e
commit c3e6b49d02
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/deploy-bintray.sh
View File

@ -16,11 +16,11 @@ if [ -z ${GIT_BRANCH+x} ] && [ -z ${APPVEYOR_REPO_BRANCH+x} ]; then
current_branch=$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!') current_branch=$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!')
else else
if [ -z ${GIT_BRANCH+x} ]; then if [ -z ${GIT_BRANCH+x} ]; then
echo "Setting to GIT_BRANCH"
current_branch=$(echo $GIT_BRANCH | cut -d / -f 2)
else
echo "Setting to APPVEYOR_REPO_BRANCH" echo "Setting to APPVEYOR_REPO_BRANCH"
current_branch=$APPVEYOR_REPO_BRANCH current_branch=$APPVEYOR_REPO_BRANCH
else
echo "Setting to GIT_BRANCH"
current_branch=$(echo $GIT_BRANCH | cut -d / -f 2)
fi fi
fi fi

22
package/osx/make_dmg.sh
View File

@ -4,8 +4,8 @@
# Requires PAR::Packer to be installed for the version of # Requires PAR::Packer to be installed for the version of
# perl copied. # perl copied.
# Adapted from script written by bubnikv for Prusa3D. # Adapted from script written by bubnikv for Prusa3D.
# Required environment variables: # Run from slic3r repo root directory.
# SLIC3R_VERSION - x.x.x format SLIC3R_VERSION=$(grep "VERSION" xs/src/libslic3r/libslic3r.h | awk -F\" '{print $2}')
if [ "$#" -ne 1 ]; then if [ "$#" -ne 1 ]; then
echo "Usage: $(basename $0) dmg_name" echo "Usage: $(basename $0) dmg_name"
@ -20,11 +20,25 @@ if [ $(git describe &>/dev/null) ]; then
SLIC3R_BUILD_ID=$(git describe) SLIC3R_BUILD_ID=$(git describe)
else else
TAGGED=false TAGGED=false
SLIC3R_BUILD_ID=${SLIC3R_VERSION}dev SLIC3R_BUILD_ID=${SLIC3R_VERSION}
fi
if [ -z ${GIT_BRANCH+x} ] && [ -z ${APPVEYOR_REPO_BRANCH+x} ]; then
current_branch=$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!')
else
if [ -z ${GIT_BRANCH+x} ]; then
echo "Setting to APPVEYOR_REPO_BRANCH"
current_branch=$APPVEYOR_REPO_BRANCH
else
echo "Setting to GIT_BRANCH"
current_branch=$(echo $GIT_BRANCH | cut -d / -f 2)
fi
fi fi
if [ -z ${current_branch+x} ]; then
current_branch="unknown"
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 [ "$current_branch" == "master" ]; then
appname=Slic3r appname=Slic3r
dmgfile=slic3r-${SLIC3R_BUILD_ID}-${1}.dmg dmgfile=slic3r-${SLIC3R_BUILD_ID}-${1}.dmg
else else