From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 7 Dec 2023 17:51:01 +0000 (-0700)
Subject: vcs-url: improve savannah URIs
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e8c564b6c8da24a7b19b93a9f8508aa9327c2465;p=home.git

vcs-url: improve savannah URIs
---

diff --git a/.bin/vcs-url b/.bin/vcs-url
index 8eaff27..99c00d9 100755
--- a/.bin/vcs-url
+++ b/.bin/vcs-url
@@ -109,13 +109,13 @@ git_url() {
 		repo=$(echo "${remote}" | sed -e 's,^git@gitlab.com[:/],,' -e 's,^https://gitlab.com/,,' -e 's,^git://gitlab.com/,,' -e 's:[.]git$::')
 		url="https://gitlab.com/${repo}/commit/"
 		;;
-	git://git.sv.gnu.org/*|git://git.savannah.gnu.org/*)
-		repo=$(echo "${remote}" | sed -r -e 's,^git://git.(sv|savannah).gnu.org/,,' -e 's:[.]git$::')
-		url="http://git.savannah.gnu.org/cgit/${repo}.git/commit/?h="
+	git://git.sv.gnu.org/*|git://git.savannah.gnu.org/*|https://git.savannah.gnu.org/*)
+		repo=$(echo "${remote}" | sed -E -e 's,^(git|https)://git.(sv|savannah).gnu.org/(git/)?,,' -e 's:[.]git$::')
+		url="https://git.savannah.gnu.org/cgit/${repo}.git/commit/?h="
 		;;
 	git://git.sv.nongnu.org/*|git://git.savannah.nongnu.org/*)
 		repo=$(echo "${remote}" | sed -r -e 's,^git://git.(sv|savannah).nongnu.org/,,' -e 's:[.]git$::')
-		url="http://git.savannah.nongnu.org/cgit/${repo}.git/commit/?h="
+		url="https://git.savannah.nongnu.org/cgit/${repo}.git/commit/?h="
 		;;
 	git://git.code.sf.net/p/*|ssh://*@git.code.sf.net/p/*)
 		repo=$(echo "${remote}" | sed -r -e 's,(git://|ssh://([^@]*@)?)git.code.sf.net/p/([^/]*)/.*,\3,')