From 2db02c13183c002476c4d2eda92ae3e106f47d87 Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Sun, 13 Mar 2016 16:56:51 +0300 Subject: copydlldeps.sh: fix #1226 (case insensitive) --- tools/copydlldeps.sh | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tools/copydlldeps.sh b/tools/copydlldeps.sh index 23b31ca..fa0b821 100755 --- a/tools/copydlldeps.sh +++ b/tools/copydlldeps.sh @@ -356,21 +356,27 @@ fi for dll in `echo $alldeps | tr '\n' ' '`; do counter=0 + lower_dll=`echo $dll | tr '[:upper:]' '[:lower:]'` + if [ $lower_dll == $dll ]; then + lower_dll="" + fi for curFolder in $( echo "${str_srcDirList}" | tr -s ' ' | tr ' ' '\n'); do if [ "$logLevel" -gt 1 ]; then echo "search for dll $dll in curFolder $curFolder" sleep 1 - fi - if [ -e "${curFolder}/${dll}" ]; then - counter=$(expr $counter + 1) - if [ $opmode == "copy" ]; then - cp -dpRxv "${curFolder}/${dll}" "$destdir" - elif [ $opmode == "print" ]; then - echo "found $dll in: ${curFolder}/${dll}" - else - echo "unknown opmode=$opmode" - fi - fi + fi + for the_dll in $dll $lower_dll; do + if [ -e "${curFolder}/${the_dll}" ]; then + counter=$(expr $counter + 1) + if [ $opmode == "copy" ]; then + cp -dpRxv "${curFolder}/${the_dll}" "$destdir" + elif [ $opmode == "print" ]; then + echo "found $dll in: ${curFolder}/${the_dll}" + else + echo "unknown opmode=$opmode" + fi + fi + done done if [ $counter == 0 ]; then echo "Warning: \"$dll\" not found. \$counter=$counter." >&2 -- cgit v0.12