Skip to content

sor: sensible quote and the like #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Artoria2e5 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

sor: sensible quote and the like #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bdbea3
sor: sensible quote and the like
Artoria2e5 Mar 31, 2020
d447371
sor: change documentation so people don't call `exit' in scripts
Artoria2e5 Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions sor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ help() {
short_usage
cat <<EOF
For each line from standard input, evaluate the specified SNIPPETs under Bash
with the line as the argument. Print the line if any snippet exits with
status 0.
with the line as the argument. Print the line if any snippet returns status 0.

-0, --null separate input and output filenames by null
--help display this help and exit
Expand All @@ -36,23 +35,25 @@ ask_for_help() {
read_filename() {
local null_terminate=$1
local target_var=$2
if [ $null_terminate = true ]; then
IFS= read -r -d '' $target_var
if [[ $null_terminate == true ]]; then
IFS= read -r -d '' "$target_var"
else
read $target_var
# shellcheck disable=SC2229
read -r "$target_var"
fi
}

print_filename() {
local null_terminate=$1
local filename="$2"
if [ $null_terminate = true ]; then
local filename=$2
if [[ $null_terminate == true ]]; then
printf '%s\0' "$filename"
else
echo "$filename"
printf '%s\n' "$filename"
fi
}

# This requires util-linux getopt.
if ! temp=$(getopt -s bash -n sor -o 0 -l null,help -- "$@"); then
ask_for_help >&2
exit 1
Expand Down Expand Up @@ -81,10 +82,12 @@ while true; do
esac
done

while read_filename $null_terminate file; do
while read_filename "$null_terminate" file; do
# shellcheck disable=SC2154
qfile=$(printf '%q' "$file")
for test in "$@"; do
if eval "$test \"$file\""; then
print_filename $null_terminate "$file"
if eval "$test $qfile"; then
print_filename "$null_terminate" "$file"
continue 2
fi
done
Expand Down