From 78773bf0f927c66f6e74a6bda9a0737c1d4e0f8a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 20 Jun 2017 21:38:39 -0400
Subject: librerelease: Fix REPODEST validation criteria

---
 src/abslibre-tools/librerelease | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index abf86dd..2da919f 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -185,15 +185,18 @@ main() {
 			REPODEST_userinfo=${BASH_REMATCH[2]}
 			REPODEST_host=${BASH_REMATCH[3]}
 			REPODEST_port=${BASH_REMATCH[5]}
+
+			if [[ "$REPODEST_host" = '['*']' ]]; then
+				REPODEST_host=${REPODEST_HOST#'['}
+				REPODEST_host=${REPODEST_HOST#']'}
+			fi
 		else
 			REPODEST_ok=false
 		fi
 
 		[[ $REPODEST_scheme == ssh ]] || REPODEST_ok=false
-		[[ -n $REPODEST_authority ]] || REPODEST_ok=false
+		[[ -n $REPODEST_host ]] || REPODEST_ok=false
 		[[ -n $REPODEST_path ]] || REPODEST_ok=false
-		[[ -n $REPODEST_userhost ]] || REPODEST_ok=false
-
 	fi
 	if ! $REPODEST_ok; then
 		error 'The format of libretools.conf:REPODEST has changed.'
@@ -208,10 +211,6 @@ main() {
 			return $EXIT_NOTCONFIGURED
 		fi
 	fi
-	if [[ "$REPODEST_host" = '['*']' ]]; then
-		REPODEST_host=${REPODEST_HOST#'['}
-		REPODEST_host=${REPODEST_HOST#']'}
-	fi
 	REPODEST_userhost="${REPODEST_userinfo:+${REPODEST_userinfo%%:*}@}${REPODEST_host}"
 
 	"$mode"
-- 
cgit v1.2.2