Skip to content

multi-apply-tool: fix some syntax errors #436

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

Merged
nephros merged 5 commits into from
May 30, 2023
Merged

multi-apply-tool: fix some syntax errors #436

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14f12a7
remove superfluous 'else'
May 26, 2023
9a233b0
add missing 'else/fi'
May 26, 2023
b8283f3
guard against unassigned/unbound variable (set -u)
May 26, 2023
c64e83f
fail on unknown parameter
May 26, 2023
1a013d9
[patchmanager-tool] Rectify indentation
Olf0 May 27, 2023
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
49 changes: 27 additions & 22 deletions src/tools/patchmanager-tool
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,11 @@ case "$1" in
operation="-a"
shift
surplus "$*"
if [ -r $PM_CONF ] && [ -s $PM_CONF ] && [ -f $PM_CONF ]; then
patchlist="$(grep '^applied=' $PM_CONF | cut -s -d "=" -f 2- | tr ',[:blank:]' ' ' | tr -s ' ')"
else
if [ -r $PM_CONF ] && [ -s $PM_CONF ] && [ -f $PM_CONF ]; then
patchlist="$(grep '^applied=' $PM_CONF | cut -s -d "=" -f 2- | tr ',[:blank:]' ' ' | tr -s ' ')"
else
printf 'File "%s" does not exist, is empty, not readable or not a regular file!\n' $PM_CONF >&2
exit 2
fi
printf 'File "%s" does not exist, is empty, not readable or not a regular file!\n' $PM_CONF >&2
exit 2
fi
;;
-d|-u|--deactivate)
Expand Down Expand Up @@ -103,24 +101,31 @@ case "$1" in
;;
-e|--export)
shift
if [ "$1" = "-f" ] || [ "$1" = "--file" ]; then
shift
filepath="$1"
shift
surplus "$*"
if [ ! -w $(dirname "$filepath") ]; then
printf 'Cannot write to given directory: %s\n' "$filepath" >&2
exit 2
elif [ -e "$filepath" ]; then
printf 'File %s exists, will not overwrite.\n' "$filepath" >&2
exit 2
if [ $# -ge 1 ]; then
if [ "$1" = "-f" ] || [ "$1" = "--file" ]; then
shift
filepath="$1"
shift
surplus "$*"
if [ ! -w $(dirname "$filepath") ]; then
printf 'Cannot write to given directory: %s\n' "$filepath" >&2
exit 2
elif [ -e "$filepath" ]; then
printf 'File %s exists, will not overwrite.\n' "$filepath" >&2
exit 2
else
grep '^applied=' $PM_CONF | cut -s -d "=" -f 2- > "$filepath"
exit 0
fi
else
grep '^applied=' $PM_CONF | cut -s -d "=" -f 2- > "$filepath"
exit 0
printf 'Unknown parameter: %s.\nIf you meant to export to a file, use "--export --file %s"\n' "$1" "$1" >&2
exit 1
fi
surplus "$*"
printf '%s\n' "$(grep '^applied=' $PM_CONF | cut -s -d "=" -f 2-)"
exit 0
else
surplus "$*"
printf '%s\n' "$(grep '^applied=' $PM_CONF | cut -s -d "=" -f 2-)"
exit 0
fi
;;
-h|--help)
usage
Expand Down