[pacman-dev] [PATCH 2/2] makepkg: Improvements to get_filename:

Gary van der Merwe garyvdm at gmail.com
Mon Aug 13 03:27:17 EDT 2012


* For any vcs other that git, the fall through resulted in being handled by the
  code for std url, hence fragments were being left on.
* Handle vcs urls than end in a slash correctly, eg http://example.com/project/
---
 scripts/makepkg.sh.in | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 3460824..7284c12 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -236,12 +236,14 @@ get_filename() {
 	local proto=$(get_protocol "$netfile")
 
 	case $proto in
-		git*|hg*|svn*|bzr*)
-			filename=${netfile##*/}
-			filename=${filename%%#*}
-			# fall-through
-			;;&
+		hg*|svn*|bzr*)
+			filename=${netfile%%#*}
+			filename=${filename%/}
+			filename=${filename##*/}
+			;;
 		git*)
+			filename=${netfile%%#*}
+			filename=${filename##*/}
 			filename=${filename%%.git*}
 			;;
 		*)
-- 
1.7.11.4



More information about the pacman-dev mailing list