From d39cb52bcba870e117b833aaec8e7ea1d605c067 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Sun, 6 Oct 2019 23:04:07 -0500 Subject: checkapk: print hardlinks correctly --- checkapk.in | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/checkapk.in b/checkapk.in index df2d293..cb8abbe 100644 --- a/checkapk.in +++ b/checkapk.in @@ -52,21 +52,28 @@ filelist() { local tar_fmt case "$tar_flavor" in - GNU|busybox) - # GNU: + GNU) # -rw-r--r-- root/root 737 2019-06-14 20:45 .PKGINFO # lrwxrwxrwx root/root 0 2019-09-13 06:01 usr/lib/libixion-0.15.so.0 -> libixion-0.15.so.0.0.0 - # busybox: + # hrwxr-xr-x root/root 0 2019-04-22 10:26 usr/bin/python3.6 link to usr/bin/python3.6m + tar_fmt='{ printf "%s %s ", $1, $2 } + /^l/ { printf "%s -> ", $(NF-2) } + /^h/ { printf "%s -> ", $(NF-3) } + { print $NF }';; + busybox) # -rw-r--r-- root/root 737 2019-06-14 20:45:29 .PKGINFO # lrwxrwxrwx root/root 0 2019-09-13 06:01:49 usr/lib/libixion-0.15.so.0 -> libixion-0.15.so.0.0.0 + # -rwxr-xr-x root/root 0 2019-04-22 10:26:45 usr/bin/python3.6 -> usr/bin/python3.6m tar_fmt='{ printf "%s %s ", $1, $2 } - /^l/ { printf "%s -> ", $(NF-2) } + / -> / { printf "%s -> ", $(NF-2) } { print $NF }';; libarchive) # -rw-r--r-- 0 root root 737 Jun 14 15:45 .PKGINFO # lrwxrwxrwx 0 root root 0 Sep 13 01:01 usr/lib/libixion-0.15.so.0 -> libixion-0.15.so.0.0.0 + # hrwxr-xr-x 0 root root 0 Oct 1 22:40 usr/bin/python3.6m link to usr/bin/python3.6 tar_fmt='{ printf "%s %s/%s ", $1, $3, $4 } /^l/ { printf "%s -> ", $(NF-2) } + /^h/ { printf "%s -> ", $(NF-3) } { print $NF }';; esac -- cgit v1.2.3-60-g2f50