Skip to content

Commit

Permalink
imagemagick: fix downloaded version
Browse files Browse the repository at this point in the history
much too busy
  • Loading branch information
wwwutz committed Jul 31, 2024
1 parent 55ff25e commit f660b0b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.profile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 10 additions & 9 deletions imagemagick.build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f660b0b

Please sign in to comment.