install/php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mod_php_install.sh: fix error determin MagickWand-config file.

Browse Source
This commit is contained in:
Christoph 2021-07-05 22:55:43 +02:00
parent cb17addc17
commit 5b92d6ee02
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mod_php_install.sh
View File

@ -3967,7 +3967,8 @@ echo "cd /tmp" >> ${_logdir}/pecl_install.log
echo "_MagickWand_config=\$(which MagickWand-config)" >> ${_logdir}/pecl_install.log
cd /tmp
_MagickWand_config=`which MagickWand-config`
if [ -z "$_MagickWand_config" ]; then
if [[ -z "$_MagickWand_config" ]] || [[ ! -f "$(realpath "$_MagickWand_config")" ]]; then
echo "# Remove broken link '/usr/bin/MagickWand-config'" >> ${_logdir}/pecl_install.log
echo "rm /usr/bin/MagickWand-config" >> ${_logdir}/pecl_install.log
@ -3988,14 +3989,23 @@ if [ -z "$_MagickWand_config" ]; then
echo "" >> ${_logdir}/pecl_install.log
echo "# Update file name database (updatedb).." >> ${_logdir}/pecl_install.log
echo "updatedb" >> ${_logdir}/pecl_install.log
updatedb >> ${_logdir}/pecl_install.log 2>&1
if [ "$?" = "0" ]; then
echo_ok
if $SKIP_UPDATE_DB ; then
echo_skipped
else
echo_failed
updatedb >> ${_logdir}/pecl_install.log 2>&1
if [ "$?" = "0" ]; then
echo_ok
else
echo_failed
fi
fi
_MagickWand_config=`locate MagickWand-config | grep -e "/MagickWand-config$" | head -n 1`
if [ ! -f "$_MagickWand_config" ]; then
_MagickWand_config="$(find /usr/lib/x86_64-linux-gnu/ -type f -name MagickWand-config | head -n 1)"
fi
if [ -f "$_MagickWand_config" ]; then
echononl "\tSymlink /usr/bin/MagickWand-config --> $_MagickWand_config"
echo "" >> ${_logdir}/pecl_install.log
@ -4011,7 +4021,7 @@ if [ -z "$_MagickWand_config" ]; then
warn "Cannot find \"MagickWand_config\" - but is needed for \"imagick\"."
echo "" >> ${_logdir}/pecl_install.log
echo "# ---" >> ${_logdir}/pecl_install.log
echo "# Warning: Cannot find \"MagickWand_config\" - but is needed for \"imagick\"."
echo "# Warning: Cannot find \"MagickWand_config\" - but is needed for \"imagick\"." >> ${_logdir}/pecl_install.log
echo "# ---" >> ${_logdir}/pecl_install.log
fi