Merge branch 'libreboot-main-cleanup' of kragle/libreboot into master

2 files changed, 5 insertions, 13 deletions

diff --git a/libs/project b/libs/project
index bcb73f16..8eaf0d2d 100755
--- a/libs/project
+++ b/libs/project
@@ -16,12 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PROJECT_ACTIONS_GENERIC=(usage download extract update build install release clean)
+PROJECT_ACTIONS_GENERIC_IGNORE_CHECK=(usage clean)
 PROJECT_ACTIONS_HELPERS=(arguments)
-PROJECT_ACTIONS_FUNCTIONS=(
-	"${PROJECT_ACTIONS_GENERIC[@]}"
-	"${PROJECT_ACTIONS_GENERIC[@]/%/_check}"
-	"${PROJECT_ACTIONS_HELPERS[@]}"
-)
 
 INSTALL_REGEX='\([^:]*\):\(.*\)'
 
@@ -30,7 +26,7 @@ project_include() {
 
 	local project_path=$( project_path "$project" )
 
-	unset -f "${PROJECT_ACTIONS_FUNCTIONS[@]}"
+	unset -f "${PROJECT_ACTIONS[@]}"
 
 	source "$project_path/$project"
 
@@ -732,7 +728,7 @@ project_update_check_git() {
 
 	requirements "git"
 
-	if git_project_check "$repository"
+	if ! git_project_check "$repository"
 	then
 		# Git repository should always be updated (even if upstream didn't progress).
 		# For instance, this is useful for testing new versions of patches without changing revision.
diff --git a/libs/tool b/libs/tool
index 0f9fb063..03d2d508 100755
--- a/libs/tool
+++ b/libs/tool
@@ -16,19 +16,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 TOOL_ACTIONS_GENERIC=(usage update execute)
+TOOL_ACTIONS_GENERIC_IGNORE_CHECK=(usage update)
 TOOL_ACTIONS_HELPERS=(arguments)
-TOOL_ACTIONS_FUNCTIONS=(
-	"${TOOL_ACTIONS_GENERIC[@]}"
-	"${TOOL_ACTIONS_GENERIC[@]/%/_check}"
-	"${TOOL_ACTIONS_HELPERS[@]}"
-)
 
 tool_include() {
 	local tool=$1
 
 	local tool_path=$( tool_path "$tool" )
 
-	unset -f "${TOOL_ACTIONS_FUNCTIONS[@]}"
+	unset -f "${TOOL_ACTIONS[@]}"
 
 	. "$tool_path/$tool"