libmakepkg/executable: don't rely on scoped value of $ret to flag outcomes

Elsewhere, we return 1 if a library dropin fails, and when running
functions in a loop, we use `|| ret=1` to preserve scope. This ensures
the return value of the function remains useful in isolation. Do the
same thing here as well.

Drop trivial function which wraps a dropin that also uses $ret, since
it's no longer needed.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 1 insertions, 7 deletions

diff --git a/scripts/libmakepkg/executable/vcs.sh.in b/scripts/libmakepkg/executable/vcs.sh.in
index 527d6f22..46631f39 100644
--- a/scripts/libmakepkg/executable/vcs.sh.in
+++ b/scripts/libmakepkg/executable/vcs.sh.in
@@ -49,7 +49,7 @@ get_vcsclient() {
 	printf "%s\n" "$client"
 }
 
-check_vcs_software() {
+executable_vcs() {
 	local netfile all_sources all_deps deps ret=0
 
 	if (( SOURCEONLY == 1 )); then
@@ -101,9 +101,3 @@ check_vcs_software() {
 
 	return $ret
 }
-
-executable_vcs() {
-	if ! check_vcs_software; then
-		ret=1
-	fi
-}