summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary van der Merwe <garyvdm@gmail.com>2012-08-16 11:30:34 +0200
committerDan McGee <dan@archlinux.org>2012-09-18 08:39:37 -0500
commit03ea8ca6a996c02f62d067eb5793aa59fe60ba8f (patch)
treec6c3f39dc477acb1cbfc46fbefa625cc039dfd30
parentc926c39b0481ec3db931fff1f86db0c49d78976b (diff)
downloadpacman-03ea8ca6a996c02f62d067eb5793aa59fe60ba8f.tar.xz
makepkg: Improvements to get_filename:
* 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/ Signed-off-by: Gary van der Merwe <garyvdm@gmail.com>
-rw-r--r--scripts/makepkg.sh.in12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 7ec523c8..51d3971c 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -237,12 +237,12 @@ get_filename() {
case $proto in
git*|hg*|svn*)
- filename=${netfile##*/}
- filename=${filename%%#*}
- # fall-through
- ;;&
- git*)
- filename=${filename%%.git*}
+ filename=${netfile%%#*}
+ filename=${filename%/}
+ filename=${filename##*/}
+ if [[ $proto = git* ]]; then
+ filename=${filename%%.git*}
+ fi
;;
*)
# if it is just an URL, we only keep the last component