From 946417d314ab13daf36b1be17002c5b0b6421773 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@bitmessage.ch>
Date: Thu, 11 Oct 2018 07:22:09 +0200
Subject: [PATCH] Make --gcc6 work with fish; add 'source' to usage

---
 helpers/envkernel.fish | 15 ++++++++++++---
 helpers/envkernel.sh   |  6 +++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/helpers/envkernel.fish b/helpers/envkernel.fish
index c07813c8..b624614e 100644
--- a/helpers/envkernel.fish
+++ b/helpers/envkernel.fish
@@ -2,12 +2,21 @@
 # Copyright 2018 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+if [ "$argv" != "" ]
+	and [ "$argv" != "--gcc6" ]
+	echo "usage: source envkernel.fish"
+	echo "optional arguments:"
+	echo "    --gcc6        Use GCC6 cross compiler"
+	echo "    --help        Show this help message"
+	exit 1
+end
+
 # Fish compatibility code from envkernel.sh
 set script_dir (dirname (status filename))
-sh "$script_dir/envkernel.sh" --fish 1>| read -z fishcode
+sh "$script_dir/envkernel.sh" $argv --fish 1>| read -z fishcode
 
-# Verbose output
-if [ "$argv" = "-v" ]
+# Verbose output (enable with: 'set ENVKERNEL_FISH_VERBOSE 1')
+if [ "$ENVKERNEL_FISH_VERBOSE" = "1" ]
 	echo "(eval code start)"
 	printf "$fishcode"
 	echo "(eval code end)"
diff --git a/helpers/envkernel.sh b/helpers/envkernel.sh
index 2dd462ae..bf73e502 100644
--- a/helpers/envkernel.sh
+++ b/helpers/envkernel.sh
@@ -187,12 +187,12 @@ cross_compiler_version() {
 print_usage() {
 	# shellcheck disable=SC2039
 	if [ -n "${BASH_SOURCE[0]}" ]; then
-		echo "usage: $(basename "${BASH_SOURCE[0]}")"
+		echo "usage: source $(basename "${BASH_SOURCE[0]}")"
 	else
-		echo "usage: $(basename "$1")"
+		echo "usage: source $(basename "$1")"
 	fi
 	echo "optional arguments:"
-	echo "    --fish        Print fish alias syntax"
+	echo "    --fish        Print fish alias syntax (internally used)"
 	echo "    --gcc6        Use GCC6 cross compiler"
 	echo "    --help        Show this help message"
 }