Merge branch 'build-system-merge' of kragle/libreboot into master

2 files changed, 6 insertions, 12 deletions

diff --git a/libs/project b/libs/project
index 00ad76c6..eb376ae0 100755
--- a/libs/project
+++ b/libs/project
@@ -46,16 +46,13 @@ project_helper_include() {
 }
 
 project_check() {
-	local project=$1
+	local project="${1##*/}"
 
-	local project_path=$( project_path "$project" )
+	local project_path="$(project_path "${project}")"
 
-	if ! [ -f "$project_path/$project" ]
-	then
+	if ! [[ -f "${project_path}/${project}" ]]; then
 		return 1
 	fi
-
-	return 0
 }
 
 project_function_check() {
diff --git a/libs/tool b/libs/tool
index 6bf57be1..3a9c4a1b 100755
--- a/libs/tool
+++ b/libs/tool
@@ -44,16 +44,13 @@ tool_helper_include() {
 }
 
 tool_check() {
-	local tool=$1
+	local tool="${1##*/}"
 
-	local tool_path=$( tool_path "$tool" )
+	local tool_path="$(tool_path "${tool}")"
 
-	if ! [ -f "$tool_path/$tool" ]
-	then
+	if ! [[ -f "${tool_path}/${tool}" ]]; then
 		return 1
 	fi
-
-	return 0
 }
 
 tool_function_check() {