diff options
author | Andrew Robbins <contact@andrewrobbins.info> | 2019-10-30 00:27:27 -0500 |
---|---|---|
committer | Andrew Robbins <contact@andrewrobbins.info> | 2019-10-30 00:32:47 -0500 |
commit | 692ef71d29082a07d94787798ed595b91bca59b8 (patch) | |
tree | 7529b1d48ecd2520c57719e7a0b1ffe236ceeb49 | |
parent | 7b8af136f1f620cb91c170d897cde89b357b80a1 (diff) | |
download | librebootfr-692ef71d29082a07d94787798ed595b91bca59b8.tar.gz librebootfr-692ef71d29082a07d94787798ed595b91bca59b8.zip |
Fix project usage action
The project's scripts were never sourced before calling usage(),
causing project_action() to fail.
project_action_usage() should be used only when a project's
scripts have not yet been sourced otherwise its call to
project_include() would be redundant.
-rwxr-xr-x | libreboot | 4 | ||||
-rwxr-xr-x | libs/project | 11 |
2 files changed, 13 insertions, 2 deletions
@@ -100,8 +100,8 @@ libreboot_project() { if ! project_function_check "$project" "$action"; then libreboot_usage exit 1 - elif [[ "$action" == 'usage' ]]; then - project_action "$action" "$project" "$@" + elif [[ $action == usage ]]; then + project_action_usage "$project" "$@" else project_action_arguments "$action" "$project" "$@" fi diff --git a/libs/project b/libs/project index 0bcc4d9d..673689ee 100755 --- a/libs/project +++ b/libs/project @@ -378,6 +378,17 @@ project_action_projects() { done < "$path" } +project_action_usage() { + local project=$1 + shift + + ( + project_include "$project" + + project_action usage "$project" "$@" + ) +} + project_path() { local project=$1 |