* [PATCH] guilt: fix portability problem with using find -perm +111
@ 2016-07-09 22:18 Theodore Ts'o
2016-07-10 7:01 ` Johannes Schindelin
0 siblings, 1 reply; 2+ messages in thread
From: Theodore Ts'o @ 2016-07-09 22:18 UTC (permalink / raw)
To: Git Mailing List; +Cc: Theodore Ts'o
GNU find no longers accepts -perm +111, even though the rest of the
world (MacOS, Solaris, BSD) still do. Workaround this problem by
using -executable if the system find utility will accept it.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
guilt | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/guilt b/guilt
index 38d426b..b90f02d 100755
--- a/guilt
+++ b/guilt
@@ -73,8 +73,17 @@ GUILT_PATH="$(dirname "$0")"
guilt_commands()
{
- find "$GUILT_PATH/../lib/guilt" -maxdepth 1 -name "guilt-*" -type f -perm +111 2> /dev/null | sed -e "s/.*\\/$GUILT-//"
- find "$GUILT_PATH" -maxdepth 1 -name "guilt-*" -type f -perm +111 | sed -e "s/.*\\/$GUILT-//"
+ # GNU Find no longer accepts -perm +111, even though the rest
+ # world (MacOS, Solaris, BSD, etc.) does. Sigh. Using -executable
+ # is arugably better, but it is a GNU extension. Since this isn't
+ # a fast path and guilt doesn't use autoconf, test for it as needed.
+ if find . -maxdepth 0 -executable > /dev/null 2>&1 ; then
+ exe_test="-executable"
+ else
+ exe_test="-find +111"
+ fi
+ find "$GUILT_PATH/../lib/guilt" -maxdepth 1 -name "guilt-*" -type f $exe_test 2> /dev/null | sed -e "s/.*\\/$GUILT-//"
+ find "$GUILT_PATH" -maxdepth 1 -name "guilt-*" -type f $exe_test | sed -e "s/.*\\/$GUILT-//"
}
# by default, we shouldn't fail
--
2.5.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] guilt: fix portability problem with using find -perm +111
2016-07-09 22:18 [PATCH] guilt: fix portability problem with using find -perm +111 Theodore Ts'o
@ 2016-07-10 7:01 ` Johannes Schindelin
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2016-07-10 7:01 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: Git Mailing List
Hi Ted,
On Sat, 9 Jul 2016, Theodore Ts'o wrote:
> + # is arugably better, but it is a GNU extension. Since this isn't
s/arugably/arguably/
Ciao,
Dscho
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-10 7:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-09 22:18 [PATCH] guilt: fix portability problem with using find -perm +111 Theodore Ts'o
2016-07-10 7:01 ` Johannes Schindelin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).