(scripts) fix for spaces in paths/arguments of whitespace remover
This commit is contained in:
@@ -23,7 +23,7 @@ function remove-whitespace {
|
||||
unset args
|
||||
unset arguments
|
||||
|
||||
for arg in $@; do
|
||||
for arg in "$@"; do
|
||||
if [[ "${arg}" =~ ^-[a-zA-Z]{2,}$ ]]; then
|
||||
temp=($(echo ${arg} | grep --color=never -o "."))
|
||||
args+=(${temp[@]/#/-})
|
||||
@@ -32,14 +32,14 @@ function remove-whitespace {
|
||||
fi
|
||||
done
|
||||
|
||||
for arg in ${args[@]}; do
|
||||
for arg in "${args[@]}"; do
|
||||
[[ "${arg}" != "--" ]] && arguments+=("${arg}")
|
||||
done
|
||||
unset args
|
||||
|
||||
for arg in ${arguments[@]}; do
|
||||
for arg in "${arguments[@]}"; do
|
||||
unset arg_found
|
||||
case ${arg} in
|
||||
case "${arg}" in
|
||||
"-u" | "--unix")
|
||||
arg_found="true"
|
||||
ffunix="true"
|
||||
@@ -82,18 +82,18 @@ function remove-whitespace {
|
||||
grep_regex=$'[[:blank:]]+\r?$'
|
||||
fi
|
||||
|
||||
for arg in ${path_args[@]}; do
|
||||
files+=($(
|
||||
for arg in "${path_args[@]}"; do
|
||||
files+=("$(
|
||||
find "${arg}" \
|
||||
${exclude_paths[@]/#/-not -path } \
|
||||
${exclude_files[@]/#/-not -name } \
|
||||
-type f \
|
||||
-exec grep -EIq "${grep_regex}" {} \; \
|
||||
-print
|
||||
))
|
||||
)")
|
||||
done
|
||||
for arg in ${file_args[@]}; do
|
||||
grep -EIq "${grep_regex}" ${arg} && files+=("${arg}")
|
||||
for arg in "${file_args[@]}"; do
|
||||
grep -EIq "${grep_regex}" "${arg}" && files+=("${arg}")
|
||||
done
|
||||
|
||||
if [[ -z "${files[@]}" ]] && [[ -n "${path_args}" ]]; then
|
||||
@@ -124,7 +124,7 @@ EOF
|
||||
fi
|
||||
|
||||
if [[ -z "${no_action}" ]]; then
|
||||
for file in ${files[@]}; do
|
||||
for file in "${files[@]}"; do
|
||||
if [[ -n "${ffunix}" ]]; then
|
||||
sed -i "${sed_cmd}" ${file}
|
||||
else
|
||||
@@ -139,7 +139,7 @@ EOF
|
||||
tput smso
|
||||
echo "The following files contain whitespace:"
|
||||
tput sgr0
|
||||
for file in ${files[@]}; do
|
||||
for file in "${files[@]}"; do
|
||||
echo "${file}"
|
||||
done
|
||||
elif [[ -z "${silent}" ]] &&
|
||||
@@ -148,9 +148,8 @@ EOF
|
||||
tput smso
|
||||
echo "The following files contained whitespace:"
|
||||
tput sgr0
|
||||
for file in ${files[@]}; do
|
||||
for file in "${files[@]}"; do
|
||||
echo "${file}"
|
||||
done
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user