diff --git a/setup/09-proxspace_setup.post b/setup/09-proxspace_setup.post index 7aedcf99a..ebb512501 100644 --- a/setup/09-proxspace_setup.post +++ b/setup/09-proxspace_setup.post @@ -17,7 +17,7 @@ if [ \( ! -f /setup/installed64.txt -a "$MSYSTEM" == "MINGW64" \) ]; then ps-rankmirrors fi - yes | pacman -Su + yes | pacman -Suy ps-setup fi fi \ No newline at end of file diff --git a/setup/bin/ps-setup b/setup/bin/ps-setup index 26add61b3..ca165640e 100644 --- a/setup/bin/ps-setup +++ b/setup/bin/ps-setup @@ -9,6 +9,8 @@ check_install () { setup_proxspace () { if [ "$MSYSTEM" == "MINGW64" ]; then + echo "XferCommand = /usr/bin/wget --passive-ftp --tries=3 --timeout=5 -c -O %o %u" >> /etc/pacman.conf + for pkg in $(grep "^[^#;]" /setup/packages.txt); do check_install $pkg done diff --git a/setup/pacman.conf b/setup/pacman.conf deleted file mode 100644 index e2763a58f..000000000 --- a/setup/pacman.conf +++ /dev/null @@ -1,85 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -HoldPkg = pacman -#XferCommand = /usr/bin/curl -C - -f %u > %o -XferCommand = /usr/bin/wget --passive-ftp --tries=3 --timeout=5 -c -O %o %u -#CleanMethod = KeepInstalled -#UseDelta = 0.7 -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -Color -#TotalDownload -CheckSpace -#VerbosePkgLists - -# By default, pacman accepts packages signed by keys that its local keyring -# trusts (see pacman-key and its man page), as well as unsigned packages. -#SigLevel = Never -SigLevel = Required DatabaseOptional -LocalFileSigLevel = Optional -#RemoteFileSigLevel = Required - -# NOTE: You must run `pacman-key --init` before first using pacman; the local -# keyring can then be populated with the keys of all official Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -[mingw32] -Include = /etc/pacman.d/mirrorlist.mingw32 - -[mingw64] -Include = /etc/pacman.d/mirrorlist.mingw64 - -[msys] -Include = /etc/pacman.d/mirrorlist.msys - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs