From 692ef71d29082a07d94787798ed595b91bca59b8 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Wed, 30 Oct 2019 00:27:27 -0500 Subject: 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. --- libreboot | 4 ++-- libs/project | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libreboot b/libreboot index 30ea9f63..b3c97f5d 100755 --- a/libreboot +++ b/libreboot @@ -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 -- cgit v1.2.3-70-g09d2