Skip to content

Introduce and use inline die for cases when its not available. #137

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
merged 1 commit into from
Sep 21, 2020
Merged

Introduce and use inline die for cases when its not available. #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Buxfixes:

* `argbash-init` is able to handle empty string as the only argument without being puzzled (#130).
* Error handling of script working directory detection now more robust (#134).

New features:

Expand Down
2 changes: 1 addition & 1 deletion bin/argbash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ handle_passed_args_count
assign_positional_args 1 "${_positionals[@]}"

# OTHER STUFF GENERATED BY Argbash
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || die "Couldn't determine the script's running directory, which probably matters, bailing out" 2
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || { echo "Couldn't determine the script's running directory, which probably matters, bailing out" >&2; exit 2; }
# Validation of values


Expand Down
2 changes: 1 addition & 1 deletion src/stuff.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ m4_define([_DEFINE_SCRIPT_DIR], [m4_do(
[m4_define([SCRIPT_DIR_DEFINED])],
[m4_define([_SCRIPT_DIR_NAME], m4_ifnblank([$1], [[$1]], _DEFAULT_SCRIPTDIR))],
[m4_list_append([_OTHER],
m4_quote(_SCRIPT_DIR_NAME[="$($2)" || die "Couldn't determine the script's running directory, which probably matters, bailing out" 2]))],
m4_quote(_SCRIPT_DIR_NAME[="$($2)" || ]_INLINE_DIE_BLOCK([Couldn't determine the script's running directory, which probably matters, bailing out], 2)))],
)])


Expand Down
8 changes: 8 additions & 0 deletions src/utilities.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,14 @@ m4_define([_LIST_LONGEST_TEXT_LENGTH], [m4_do(
m4_define([_CAPITALIZE], [m4_translit([[$1]], [a-z], [A-Z])])


dnl
dnl $1: The message - will be double-quoted
dnl $2: The return code (default = 1)
m4_define([_INLINE_DIE_BLOCK], [m4_do(
[[{ echo "$1" >&2; exit ]m4_default_quoted([$2], 1); }],
)])


dnl
dnl $1: What to underline
dnl $2: By what to underline
Expand Down