Skip to content

Commit be55824

Browse files
committed
fix: ignore-file generator
Fix shellcheck errors
1 parent 1d1ffa1 commit be55824

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

generator/run.sh

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
SCRIPT_DIR=`dirname "$0"`
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
SCRIPT_DIR=$(dirname "$0")
25
SOURCE_DIR="./source"
36
EMPTY_OUTPUT="../empty.dcignore"
47
FULL_OUTPUT="../full.dcignore"
@@ -27,17 +30,17 @@ done > "$FULL_OUTPUT"
2730

2831
echo -e "\n# Hidden directories\n.*/" >> "$FULL_OUTPUT"
2932

30-
while read -r file; do
31-
file_name=`basename $file`
33+
find $SOURCE_DIR -name '*.gitignore' | while read file; do
34+
file_name=$(basename "$file")
3235
declare -a rules=()
3336
while read -r line; do
34-
if ! [[ -z "${line// }" ]] && ! [[ "$line" =~ $REGEX ]]; then
37+
if [[ -n "${line// }" ]] && ! [[ "$line" =~ $REGEX ]]; then
3538
# The line is not empty, nor a comment, nor a rule matching:
3639
# a "/.dir_name/" directory, as we already have a catch-all rule above
3740
# a "/file_name.ext" file, as we already have extension-based filtering
3841
rules+=("$line")
3942
fi
40-
done <<< `cat "$file"`
43+
done < "$file"
4144

4245
# Debug log for checking number of rules per file.
4346
# echo "${file_name%.*} RULES: ${#rules[@]}"
@@ -48,8 +51,8 @@ while read -r file; do
4851
echo "$r" >> $FULL_OUTPUT
4952
done
5053
fi
51-
done <<< `find $SOURCE_DIR -name '*.gitignore'`
54+
done
5255

5356
cd ..
54-
echo "Parsing completed. Check '`pwd`/`basename $FULL_OUTPUT`' file for results."
57+
echo "Parsing completed. Check '$(pwd)/$(basename $FULL_OUTPUT)' file for results."
5558
exit 0

0 commit comments

Comments
 (0)