From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 21 Feb 2024 20:52:16 +0000 (+0100)
Subject: update_git_source_package.sh: misc fixes
X-Git-Url: http://git.openwrt.org/source?a=commitdiff_plain;h=e339de77b3f3dd1efed9bf52e03cd78e30599877;p=maintainer-tools.git

update_git_source_package.sh: misc fixes

 - Canonicalize TOPDIR
 - Fix github issue reference URLs

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/update_git_source_package.sh b/update_git_source_package.sh
index a6b1c51..d7f8237 100755
--- a/update_git_source_package.sh
+++ b/update_git_source_package.sh
@@ -74,7 +74,7 @@ grep -sq BuildPackage "$MAKEFILE" || {
 	}
 }
 
-export TOPDIR
+export TOPDIR=$(cd "$TOPDIR"; pwd)
 export PATH="$TOPDIR/staging_dir/host/bin:$PATH"
 
 eval $(
@@ -160,7 +160,9 @@ GIT_FIXES="$(
 		'#'[0-9]*)
 			case "$PKG_SOURCE_URL" in
 			*://github.com/*)
-				echo "${PKG_SOURCE_URL%/}/issues/${issue#\#}"
+				repourl=${PKG_SOURCE_URL%/}
+				repourl=${repourl%.git}
+				echo "${repourl}/issues/${issue#\#}"
 			;;
 			*://git.openwrt.org/project/*)
 				project=${PKG_SOURCE_URL#*://git.openwrt.org/project/}