From a65fcfc23c65732aab89581ac50b1e3a23c1b0b2 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 31 May 2016 21:28:00 +0200 Subject: [PATCH] ls-sources.pl: Fix for directory relative to root of tree Given and argument like tests/xdump, the script looks for tests/xdump/.git, tests/.git, /.git. The last one is wrong. Make it look for ./.git then. Signed-off-by: Markus Armbruster --- src/scripts/ls-sources.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scripts/ls-sources.pl b/src/scripts/ls-sources.pl index 2a1138ce..73e39c86 100755 --- a/src/scripts/ls-sources.pl +++ b/src/scripts/ls-sources.pl @@ -28,7 +28,7 @@ # ls-sources.pl: List source files # # Known contributors to this file: -# Markus Armbruster, 2015 +# Markus Armbruster, 2015-2016 # # Usage: ls-sources.pl DIR REGEX # @@ -51,9 +51,9 @@ my $srcdir = $dir; my $subdir = ""; while (! -d "$srcdir/.git" and ! -r "$srcdir/sources.mk" - and $srcdir =~ m,^(.*)/([^/]*),) { - $srcdir = $1; - $subdir = "$2/$subdir"; + and $srcdir =~ m,^((.*)/)?([^/]*),) { + $srcdir = $2 || "."; + $subdir = "$3/$subdir"; } my @sources;