From 97f189d91a62eb0de1aac418d4252c123e7263f9 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Sun, 11 Apr 2021 00:47:06 +0200 Subject: [PATCH] Finally done --- .gitattributes | 1 - setup/09-proxspace_setup.post | 1 - setup/bin/ps-setup | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 741c0a207..000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* binary \ No newline at end of file diff --git a/setup/09-proxspace_setup.post b/setup/09-proxspace_setup.post index cf922bd9a..de415df43 100644 --- a/setup/09-proxspace_setup.post +++ b/setup/09-proxspace_setup.post @@ -17,7 +17,6 @@ if [ \( ! -f /setup/installed64.txt -a "$MSYSTEM" == "MINGW64" \) ]; then sh /usr/bin/update-ca-trust fi rm /var/lib/pacman/sync/* - sed -i 's/#XferCommand = \/usr\/bin\/wget --passive-ftp -c -O %o %u/XferCommand = \/usr\/bin\/wget --passive-ftp --tries=3 --timeout=5 -c -O %o %u/g' /etc/pacman.conf yes | pacman -Syuu else if [ -z "$PSSKIPRANKING" ]; then diff --git a/setup/bin/ps-setup b/setup/bin/ps-setup index 26add61b3..a304acbd7 100644 --- a/setup/bin/ps-setup +++ b/setup/bin/ps-setup @@ -9,6 +9,8 @@ check_install () { setup_proxspace () { if [ "$MSYSTEM" == "MINGW64" ]; then + sed -i 's/#XferCommand = \/usr\/bin\/wget --passive-ftp -c -O %o %u/XferCommand = \/usr\/bin\/wget --passive-ftp --tries=3 --timeout=5 -c -O %o %u/g' /etc/pacman.conf + for pkg in $(grep "^[^#;]" /setup/packages.txt); do check_install $pkg done