no-mistakes: apply CI fixes

Author: ruby-dlee

tests/fm-account-routing.test.sh

@@ -196,6 +196,7 @@ SH
 if [ "${1:-}" = return ] && [ -n "${FM_EXPECT_CHECKOUT_LOCK_ROOT:-}" ]; then
   lock_owner=${FM_PROCESS_TREE_GUARD_FILE%/process-group}
   [ -d "$lock_owner" ] && [ ! -L "$lock_owner" ] || exit 91
+  lock_owner=$(cd "$lock_owner" 2>/dev/null && pwd -P) || exit 91
   lock_owner_parent=$(cd "$(dirname "$lock_owner")" 2>/dev/null && pwd -P) || exit 91
   expected_lock_root=$(cd "$FM_EXPECT_CHECKOUT_LOCK_ROOT" 2>/dev/null && pwd -P) || exit 91
   [ "$lock_owner_parent" = "$expected_lock_root" ] || exit 91
@@ -206,7 +207,13 @@ if [ "${1:-}" = return ] && [ -n "${FM_EXPECT_CHECKOUT_LOCK_ROOT:-}" ]; then
   lock_link=
   for candidate in "$expected_lock_root"/*.lock; do
     [ -L "$candidate" ] || continue
-    [ "$(readlink "$candidate" 2>/dev/null)" = "$lock_owner" ] || continue
+    candidate_owner=$(readlink "$candidate" 2>/dev/null) || continue
+    case "$candidate_owner" in
+      /*) ;;
+      *) candidate_owner=$(dirname "$candidate")/$candidate_owner ;;
+    esac
+    candidate_owner=$(cd "$candidate_owner" 2>/dev/null && pwd -P) || continue
+    [ "$candidate_owner" = "$lock_owner" ] || continue
     lock_link=$candidate
     break
   done