act on various suggestions from cppcheck

[apt.git] / abicheck / run_abi_test

diff --git a/abicheck/run_abi_test b/abicheck/run_abi_test
index 8f2d7d203143da54d820be0b1407af76f20de002..6e6152a6319b39aadeddd41c331bf4512bf2549e 100755 (executable)
--- a/abicheck/run_abi_test
+++ b/abicheck/run_abi_test
@@ -1,16 +1,19 @@
 #!/bin/sh
 
+# ensure we are in the abibreak subdirectory
+cd "$(readlink -f $(dirname $0))"
+
 if [ ! -d ../build ]; then
        echo "../build missing, did you run make?"
        exit 1
 fi
 
-if [ ! -x "$(which abi-compliance-checker 2>/dev/null )" ]; then
+if command -v abi-compliance-checker 2>/dev/null >&2; then
        echo "Please install the 'abi-compliance-checker' package"
        exit 1
 fi
 
-LIBPATH=$(find /usr/lib/ -type f  -name "libapt-*.so.*" -printf %p\\\\n)
+LIBPATH=$(find /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) -type f -regex '.*/libapt-\(pkg\|inst\)\.so\..*' -printf %p\\\\n)
 sed s#@installed_libapt@#$LIBPATH# apt_installed.xml.in > apt_installed.xml
 
 BUILDPATH=$(readlink -f ../build)