diff --git a/build.profile b/build.profile index 771881e..04429da 100644 --- a/build.profile +++ b/build.profile @@ -54,7 +54,7 @@ BUILD_libfontttf=liberation-fonts-ttf-2.1.5 BUILD_libfontttf_SRCURL="https://beehive.molgen.mpg.de/31b453e0b77bacde410a34a725b34f8a/${BUILD_libfontttf}.tar.gz" # gits -BUILD_imagemagick=imagemagick-7.1.1-36-5-g115271ece +BUILD_imagemagick=imagemagick-7.1.1-36 BUILD_imagemagick_SRCURL="https://github.com/ImageMagick/ImageMagick.git" BUILD_pngquant=pngquant-3.0.3-6-g9a4952d diff --git a/imagemagick.build.sh b/imagemagick.build.sh index a4d19bf..a057867 100755 --- a/imagemagick.build.sh +++ b/imagemagick.build.sh @@ -21,15 +21,16 @@ if [[ -e "${BUILD_PKG}".tar ]]; then fi if [[ ! -d ${BUILD_PKG} ]]; then - git clone "${SRCURL}" --single-branch "${BUILD_PKG}" - # check version - pushd "${BUILD_PKG}" - GITVER=imagemagick-$(git describe --tags) - popd - if [ "${GITVER}" != "${BUILD_PKG}" ]; then - echo "${BUILD_PKG} should be updated to ${GITVER} update!" - exit 1 - fi + git clone "${SRCURL}" --branch ${BUILD_PKG##imagemagick-} --single-branch "${BUILD_PKG}" +fi + +# check version +pushd "${BUILD_PKG}" +GITVER=imagemagick-$(git describe --tags) +popd +if [ "${GITVER}" != "${BUILD_PKG}" ]; then + echo "newer version than ${BUILD_PKG} found. please update to ${GITVER}" + exit 1 fi if [[ ! -e ${BUILD_PKG}.tar ]]; then