mirror of
https://github.com/Gator96100/ProxSpace.git
synced 2025-08-19 12:59:48 -07:00
Updated msys2 to msys2-base-x86_64-20200903
This commit is contained in:
parent
5bc8dbdc75
commit
2307d54cb1
18501 changed files with 1684082 additions and 720361 deletions
|
|
@ -25,7 +25,7 @@ set -o nounset
|
|||
set -o errexit
|
||||
|
||||
declare -r myname='pacscripts'
|
||||
declare -r myver='1.0.0'
|
||||
declare -r myver='1.3.0'
|
||||
|
||||
error() {
|
||||
local mesg=$1; shift
|
||||
|
|
@ -52,9 +52,7 @@ if ! DBPath="$(pacman-conf DBPath)"; then
|
|||
error "unable to read /etc/pacman.conf"
|
||||
exit 1
|
||||
fi
|
||||
CacheDir="$(pacman-conf CacheDir)"
|
||||
pac_db="${DBPath:-/var/lib/pacman}/local"
|
||||
pac_cache="${CacheDir:-/var/cache/pacman/pkg}"
|
||||
|
||||
version() {
|
||||
printf "%s %s\n" "$myname" "$myver"
|
||||
|
|
@ -103,15 +101,15 @@ print_scriptlet() {
|
|||
return 1
|
||||
fi
|
||||
url=$(pacman -Sddp $1)
|
||||
filename=$(basename $url)
|
||||
if [ ! -f "$pac_cache/$filename" ]; then
|
||||
if ! spacman -Sddw --noconfirm $1 >&2; then
|
||||
if [[ $url != file://* ]]; then
|
||||
if ! spacman -Sddw --logfile /dev/null --noconfirm $1 >&2; then
|
||||
error "Failed to download $1"
|
||||
return 1
|
||||
fi
|
||||
echo >&2
|
||||
url=$(pacman -Sddp $1)
|
||||
fi
|
||||
print_pkg "$pac_cache/$filename"
|
||||
print_pkg "${url#file://}"
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue