From 2c285392fe254ff59d5f5811942b3d32854a6ec8 Mon Sep 17 00:00:00 2001 From: Rishat Shamsutdinov Date: Fri, 1 Oct 2021 02:32:13 +0500 Subject: [PATCH 1/3] fix issues with spaces in paths --- igenstrings/merger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/igenstrings/merger.py b/igenstrings/merger.py index 36c9e95..4edd42b 100644 --- a/igenstrings/merger.py +++ b/igenstrings/merger.py @@ -66,7 +66,7 @@ def _run_genstrings(self, lang): exclusion_options = ' '.join('-not -path "{}"'.format(excl_path) for excl_path in self.excluded_paths) else: exclusion_options = '' - cmd = 'find {} {} -name \*.m -or -name \*.mm -or -name \*.swift | xargs genstrings -q -o "{}"'.format( + cmd = 'find {} {} -name \*.m -or -name \*.mm -or -name \*.swift -exec genstrings -q -o "{}" "{{}}" \\;'.format( self.path, exclusion_options, lang) From e7d2e7ac77310de4c48e8240a4920398c420b799 Mon Sep 17 00:00:00 2001 From: Rishat Shamsutdinov Date: Tue, 9 Nov 2021 20:34:44 +0500 Subject: [PATCH 2/3] fix paths exclusion --- igenstrings/merger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/igenstrings/merger.py b/igenstrings/merger.py index 4edd42b..362abe8 100644 --- a/igenstrings/merger.py +++ b/igenstrings/merger.py @@ -66,7 +66,7 @@ def _run_genstrings(self, lang): exclusion_options = ' '.join('-not -path "{}"'.format(excl_path) for excl_path in self.excluded_paths) else: exclusion_options = '' - cmd = 'find {} {} -name \*.m -or -name \*.mm -or -name \*.swift -exec genstrings -q -o "{}" "{{}}" \\;'.format( + cmd = 'find {} {} -and \( -name \*.m -or -name \*.mm -or -name \*.swift \) -exec genstrings -q -o "{}" "{{}}" \\;'.format( self.path, exclusion_options, lang) From 96bae13494ee6fbb9f311d0f60bbb3af7849f33f Mon Sep 17 00:00:00 2001 From: Rishat Shamsutdinov Date: Tue, 9 Nov 2021 22:29:54 +0500 Subject: [PATCH 3/3] fixes for merger --- igenstrings/merger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/igenstrings/merger.py b/igenstrings/merger.py index 362abe8..1701c36 100644 --- a/igenstrings/merger.py +++ b/igenstrings/merger.py @@ -66,7 +66,7 @@ def _run_genstrings(self, lang): exclusion_options = ' '.join('-not -path "{}"'.format(excl_path) for excl_path in self.excluded_paths) else: exclusion_options = '' - cmd = 'find {} {} -and \( -name \*.m -or -name \*.mm -or -name \*.swift \) -exec genstrings -q -o "{}" "{{}}" \\;'.format( + cmd = 'find {} {} -and \( -name \*.m -or -name \*.mm -or -name \*.swift \) -print0 | xargs -0 genstrings -q -o "{}" \\;'.format( self.path, exclusion_options, lang)