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

1 files changed, 7 insertions, 6 deletions

diff --git a/libreboot b/libreboot
index 59795d09..af4c1f49 100755
--- a/libreboot
+++ b/libreboot
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 # Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr>
+# Copyright (C) 2017 Andrew Robbins <contact@andrewrobbins.info>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -78,12 +79,12 @@ libreboot_project() {
 
 	case "${action}" in
 		'sources')
-			(
-				set +e
-
-				project_action_arguments 'extract' "${project}" "$@" && return 0
-				project_action_arguments 'download' "${project}" "$@" && return 0
-			)
+			if project_action_arguments 'extract' "${project}" "$@"; then
+				return
+			else
+				printf '\n%s\n\n' 'Attempting to download instead...'
+				project_action_arguments 'download' "${project}" "$@"
+			fi
 			;;
 		'produce')
 			for action in 'build' 'install' 'release'; do