diff options
Diffstat (limited to 'scripts/libmakepkg/source')
-rw-r--r-- | scripts/libmakepkg/source/bzr.sh.in | 2 | ||||
-rw-r--r-- | scripts/libmakepkg/source/file.sh.in | 2 | ||||
-rw-r--r-- | scripts/libmakepkg/source/git.sh.in | 13 | ||||
-rw-r--r-- | scripts/libmakepkg/source/hg.sh.in | 2 | ||||
-rw-r--r-- | scripts/libmakepkg/source/local.sh.in | 2 | ||||
-rw-r--r-- | scripts/libmakepkg/source/svn.sh.in | 2 |
6 files changed, 9 insertions, 14 deletions
diff --git a/scripts/libmakepkg/source/bzr.sh.in b/scripts/libmakepkg/source/bzr.sh.in index af8c3c50..97206714 100644 --- a/scripts/libmakepkg/source/bzr.sh.in +++ b/scripts/libmakepkg/source/bzr.sh.in @@ -2,7 +2,7 @@ # # bzr.sh - function for handling the download and "extraction" of Bazaar sources # -# Copyright (c) 2015-2016 Pacman Development Team <pacman-dev@archlinux.org> +# Copyright (c) 2015-2017 Pacman Development Team <pacman-dev@archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 20493a67..1d85ea9b 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -2,7 +2,7 @@ # # file.sh - function for handling the download and extraction of source files # -# Copyright (c) 2015-2016 Pacman Development Team <pacman-dev@archlinux.org> +# Copyright (c) 2015-2017 Pacman Development Team <pacman-dev@archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scripts/libmakepkg/source/git.sh.in b/scripts/libmakepkg/source/git.sh.in index cc27663d..6d7e0a67 100644 --- a/scripts/libmakepkg/source/git.sh.in +++ b/scripts/libmakepkg/source/git.sh.in @@ -2,7 +2,7 @@ # # git.sh - function for handling the download and "extraction" of Git sources # -# Copyright (c) 2015-2016 Pacman Development Team <pacman-dev@archlinux.org> +# Copyright (c) 2015-2017 Pacman Development Team <pacman-dev@archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -39,6 +39,7 @@ download_git() { local url=$(get_url "$netfile") url=${url#git+} url=${url%%#*} + url=${url%%\?*} if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" @@ -66,14 +67,8 @@ download_git() { extract_git() { local netfile=$1 - local fragment=${netfile#*#} - if [[ $fragment = "$netfile" ]]; then - unset fragment - fi - - local repo=${netfile##*/} - repo=${repo%%#*} - repo=${repo%%.git*} + local fragment=$(get_uri_fragment "$netfile") + local repo=$(get_filename "$netfile") local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" diff --git a/scripts/libmakepkg/source/hg.sh.in b/scripts/libmakepkg/source/hg.sh.in index 61774e81..4e6ebad9 100644 --- a/scripts/libmakepkg/source/hg.sh.in +++ b/scripts/libmakepkg/source/hg.sh.in @@ -2,7 +2,7 @@ # # hg.sh - function for handling the download and "extraction" of Mercurial sources # -# Copyright (c) 2015-2016 Pacman Development Team <pacman-dev@archlinux.org> +# Copyright (c) 2015-2017 Pacman Development Team <pacman-dev@archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scripts/libmakepkg/source/local.sh.in b/scripts/libmakepkg/source/local.sh.in index 6a4b8824..8104141a 100644 --- a/scripts/libmakepkg/source/local.sh.in +++ b/scripts/libmakepkg/source/local.sh.in @@ -2,7 +2,7 @@ # # local.sh - function for handling the "download" of local sources # -# Copyright (c) 2015-2016 Pacman Development Team <pacman-dev@archlinux.org> +# Copyright (c) 2015-2017 Pacman Development Team <pacman-dev@archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scripts/libmakepkg/source/svn.sh.in b/scripts/libmakepkg/source/svn.sh.in index a78fca3d..6cb78235 100644 --- a/scripts/libmakepkg/source/svn.sh.in +++ b/scripts/libmakepkg/source/svn.sh.in @@ -2,7 +2,7 @@ # # svn.sh - function for handling the download and "extraction" of Subversion sources # -# Copyright (c) 2015-2016 Pacman Development Team <pacman-dev@archlinux.org> +# Copyright (c) 2015-2017 Pacman Development Team <pacman-dev@archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |