From d6bc6eae89447d6b22b3f23196ef8e845a8bfc4e Mon Sep 17 00:00:00 2001 From: Hari Sekhon Date: Fri, 12 May 2023 19:59:32 +0100 Subject: [PATCH] updated resource path references --- checks/check_no_tabs.sh | 2 +- checks/check_whitespace.sh | 2 +- python/python_translate_import_to_module.sh | 2 +- python/python_translate_module_to_import.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/check_no_tabs.sh b/checks/check_no_tabs.sh index 45912192..93a3d365 100755 --- a/checks/check_no_tabs.sh +++ b/checks/check_no_tabs.sh @@ -31,7 +31,7 @@ progress_char='-' [ -n "${DEBUG:-}" ] && progress_char='' files_with_tabs=0 -for filename in $(find "${1:-.}" -type f | grep -Evf "$srcdir/resources/whitespace_ignore.txt" -f "$srcdir/resources/tabs_ignore.txt" | sort); do +for filename in $(find "${1:-.}" -type f | grep -Evf "$srcdir/../resources/whitespace_ignore.txt" -f "$srcdir/../resources/tabs_ignore.txt" | sort); do isExcluded "$filename" && continue [[ "$filename" =~ .*/check_(no_tabs|whitespace).sh$|.terminal$ ]] && continue printf "%s" "$progress_char" diff --git a/checks/check_whitespace.sh b/checks/check_whitespace.sh index 60f7715a..8f003eb0 100755 --- a/checks/check_whitespace.sh +++ b/checks/check_whitespace.sh @@ -33,7 +33,7 @@ progress_char='-' whitespace_only_files_found=0 trailing_whitespace_files_found=0 trailing_whitespace_bar_files_found=0 -for filename in $(find "${1:-.}" -type f | grep -Evf "$srcdir/resources/whitespace_ignore.txt" | sort); do +for filename in $(find "${1:-.}" -type f | grep -Evf "$srcdir../resources/whitespace_ignore.txt" | sort); do isExcluded "$filename" && continue printf "%s" "$progress_char" # [[:space:]] matches \r in Windows files which we don't want, use explicit character class instead to exclude \r diff --git a/python/python_translate_import_to_module.sh b/python/python_translate_import_to_module.sh index de193c12..2d9454c2 100755 --- a/python/python_translate_import_to_module.sh +++ b/python/python_translate_import_to_module.sh @@ -37,7 +37,7 @@ usage_args="[ ...]" help_usage "$@" -mappings="$srcdir/resources/pipreqs_mapping.txt" +mappings="$srcdir../resources/pipreqs_mapping.txt" if ! [ -f "$mappings" ]; then wget -O "$mappings" https://raw.githubusercontent.com/bndr/pipreqs/master/pipreqs/mapping diff --git a/python/python_translate_module_to_import.sh b/python/python_translate_module_to_import.sh index fbdccc06..4b4b430d 100755 --- a/python/python_translate_module_to_import.sh +++ b/python/python_translate_module_to_import.sh @@ -37,7 +37,7 @@ usage_args="[ ...]" help_usage "$@" -mappings="$srcdir/resources/pipreqs_mapping.txt" +mappings="$srcdir../resources/pipreqs_mapping.txt" if ! [ -f "$mappings" ]; then wget -O "$mappings" https://raw.githubusercontent.com/bndr/pipreqs/master/pipreqs/mapping