commit 8a9cbf90c7bc728b9d3077afa00d492a6a1517a3
from: xs <xs@inda.re>
date: Wed Jun  4 22:52:11 2025 UTC

Fix exits when sourcing

commit - 0fbd0b66a703d0d19638687002ccb83138196d26
commit + 8a9cbf90c7bc728b9d3077afa00d492a6a1517a3
blob - 4d03f1c432cdcf3e26bc5f4ebffdc16893123573
blob + b3143653f54d6acba98502dd30d2c24d60a65e4c
--- Makefile
+++ Makefile
@@ -29,7 +29,7 @@ release: r7.1
 	make tests
 	rm -fr _release/r7-$(UTILITY_VERSION)
 	mkdir -p _release/r7-$(UTILITY_VERSION)
-	cp r7 r7.1 Makefile README.md _release/r7-$(UTILITY_VERSION)
+	cp LICENSE r7 r7.1 Makefile README.md _release/r7-$(UTILITY_VERSION)
 	cp -r groups/ _release/r7-$(UTILITY_VERSION)
 	cd _release && tar cfv r7-$(UTILITY_VERSION).tar r7-$(UTILITY_VERSION)
 	gzip -9 _release/r7-$(UTILITY_VERSION).tar
@@ -269,4 +269,5 @@ workdir2-importer: workdir2-init
 		done
 	find testdir/workdir2/nodes | grep sshd_config
 	find testdir/workdir2/nodes
+	cd testdir/workdir2/ && . $(UTILITY) && import notfound || :
 	@echo _________________________________________________________
blob - 6d2b3e43afa13b06302fe7b6e8d4df7642f5a08f
blob + 3f722ff8417714f5cca9f1f12edef6fc29fa27cf
--- r7
+++ r7
@@ -14,9 +14,12 @@
 # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
+
 # shellcheck disable=SC2046,SC2031
+
 # Global configuration
 # ====================
+
 VERSION=0.1.0
 : "${HOSTNAME:=$(uname -n)}"
 
@@ -156,13 +159,13 @@ eof
 _main() {
 	test -n "$ZSH_VERSION" && {
 		echo >&2 "ZSH is unsupported. Exiting."
-		exit 99
+		return 3
 	}
 	while getopts 'P:F:r:o:i:w:c:npdseaOh' arg; do
 		case $arg in
 		h)
 			usage
-			exit 0
+			return 0
 			;;
 		d)
 			R7_DEBUG=yes
@@ -1243,7 +1246,7 @@ html() {
 			</body>
 		</html>
 	eof
-	exit 0
+	return 0
 }
 
 # Importers
@@ -1289,7 +1292,8 @@ import() {
 	if test -n "$target"; then
 		echo >&2 "-> Importing target host: $target"
 		case $(ssh "$target" uname) in OpenBSD) : ;; *)
-			_fail "Importer only supports OpenBSD currently. Exiting."
+			_error "Platform unsupported or host unavailable."
+			return 3
 			;;
 		esac
 		_OpenBSD_import_ssh_authorized_keys