From 130a92cc5808a21fb4262a00fc585e74d65c08af Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sun, 04 Aug 2019 18:49:46 -0400 Subject: ob-buildopk: Fix touch -d check --- diff --git a/NEWS b/NEWS index fa74584..f665a07 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,13 @@ opkbuild version 4.1.3+dev Released: ????-??-?? +The "this time it'll work" release. + +Utilities: + + * ob-buildopk now correctly checks for the "touch" utility's "-h" + option. Apologies for the noise. + opkbuild version 4.1.3 ---------------------- diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh index 5dd7917..598419f 100644 --- a/src/ob-buildopk.sh +++ b/src/ob-buildopk.sh @@ -41,9 +41,13 @@ build_opk() # Also, we want to set the mtimes of the links themselves, if possible. rm -f '.opkbuild/touch-noderef.none' '.opkbuild/touch-noderef.link' ln -s '.opkbuild/touch-noderef.none' '.opkbuild/touch-noderef.link' - ${TOUCH} -h '.opkbuild/touch-noderef.link' 1>/dev/null 2>/dev/null || : - if ! test -f '.opkbuild/touch-noderef.none'; then - find_not_link='' touch_noderef='-h' + if ${TOUCH} -h '.opkbuild/touch-noderef.link' 1>/dev/null 2>/dev/null + then + if test -f '.opkbuild/touch-noderef.none'; then + find_not_link='! -type l' touch_noderef='' + else + find_not_link='' touch_noderef='-h' + fi else find_not_link='! -type l' touch_noderef='' fi -- cgit v0.9.1