mirror of
https://github.com/Gator96100/ProxSpace.git
synced 2025-07-30 11:38:41 -07:00
Updated msys2
This commit is contained in:
parent
6a85995508
commit
f0dc1ea8b0
13308 changed files with 689276 additions and 46605 deletions
|
@ -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-2018 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
|
||||
|
|
|
@ -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-2018 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
|
||||
|
@ -96,7 +96,7 @@ extract_file() {
|
|||
fi
|
||||
|
||||
# do not rely on extension for file type
|
||||
local file_type=$(file -bizL "$file")
|
||||
local file_type=$(file -bizL -- "$file")
|
||||
local ext=${file##*.}
|
||||
local cmd=''
|
||||
case "$file_type" in
|
||||
|
@ -132,7 +132,7 @@ extract_file() {
|
|||
$cmd -xf "$file" || ret=$?
|
||||
else
|
||||
rm -f -- "${file%.*}"
|
||||
$cmd -dcf "$file" > "${file%.*}" || ret=$?
|
||||
$cmd -dcf -- "$file" > "${file%.*}" || ret=$?
|
||||
fi
|
||||
if (( ret )); then
|
||||
error "$(gettext "Failed to extract %s")" "$file"
|
||||
|
|
|
@ -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-2018 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"
|
||||
|
@ -64,16 +65,10 @@ download_git() {
|
|||
}
|
||||
|
||||
extract_git() {
|
||||
local netfile=$1
|
||||
local netfile=$1 tagname
|
||||
|
||||
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")"
|
||||
|
@ -115,6 +110,15 @@ extract_git() {
|
|||
esac
|
||||
fi
|
||||
|
||||
if [[ ${fragment%%=*} = tag ]]; then
|
||||
tagname="$(git tag -l --format='%(tag)' "$ref")"
|
||||
if [[ -n $tagname && $tagname != $ref ]]; then
|
||||
error "$(gettext "Failure while checking out version %s, the git tag has been forged")" "$ref"
|
||||
plain "$(gettext "Aborting...")"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $ref != "origin/HEAD" ]] || (( updating )) ; then
|
||||
if ! git checkout --force --no-track -B makepkg $ref; then
|
||||
error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git"
|
||||
|
|
|
@ -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-2018 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
|
||||
|
|
|
@ -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-2018 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
|
||||
|
|
|
@ -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-2018 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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue