From 8832a906af99b92aa1851ab3bc2176c61790b05f Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Sat, 10 Apr 2021 02:44:25 +0200 Subject: [PATCH] test --- setup/09-proxspace_setup.post | 4 +++- setup/bin/ps-rankmirrors | 9 +++++---- setup/bin/ps-setup | 1 - setup/setup.cmd | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/setup/09-proxspace_setup.post b/setup/09-proxspace_setup.post index 66a535f57..41cf6e748 100644 --- a/setup/09-proxspace_setup.post +++ b/setup/09-proxspace_setup.post @@ -4,6 +4,8 @@ export PS1='\[\033]0;ProxSpace v$PSVERSION - $MSYSTEM:\w\007\033[32m\]pm3 \[\033 export PATH=/setup/bin:$PATH alias ls='ls -hF --color=auto' + + if [ -f /setup/bin/ps-upgrade.new ]; then rm /setup/bin/ps-upgrade mv /setup/bin/ps-upgrade.new /setup/bin/ps-upgrade @@ -15,7 +17,7 @@ if [ \( ! -f /setup/installed64.txt -a "$MSYSTEM" == "MINGW64" \) ]; then sh /usr/bin/update-ca-trust fi yes | pacman -Syuu - else + else if [ -z "$PSSKIPRANKING" ]; then ps-rankmirrors fi diff --git a/setup/bin/ps-rankmirrors b/setup/bin/ps-rankmirrors index c4c2a589d..1b469ab5d 100644 --- a/setup/bin/ps-rankmirrors +++ b/setup/bin/ps-rankmirrors @@ -5,7 +5,8 @@ if [ ! -f /etc/pacman.d/mirrorlist.mingw64.backup ]; then cp /etc/pacman.d/mirrorlist.mingw64 /etc/pacman.d/mirrorlist.mingw64.backup fi -#echo "Ranking msys mirrors" -#rankmirrors -v --repo msys /etc/pacman.d/mirrorlist.msys.backup | tee /etc/pacman.d/mirrorlist.msys -#echo "Ranking mingw64 mirrors" -#rankmirrors -v --repo mingw64 /etc/pacman.d/mirrorlist.mingw64.backup | tee /etc/pacman.d/mirrorlist.mingw64 \ No newline at end of file +echo "Ranking msys mirrors" +rankmirrors -v --repo msys /etc/pacman.d/mirrorlist.msys.backup | tee /etc/pacman.d/mirrorlist.msys +echo "Ranking mingw64 mirrors" +rankmirrors -v --repo mingw64 /etc/pacman.d/mirrorlist.mingw64.backup | tee /etc/pacman.d/mirrorlist.mingw64 + \ No newline at end of file diff --git a/setup/bin/ps-setup b/setup/bin/ps-setup index d691337f1..26add61b3 100644 --- a/setup/bin/ps-setup +++ b/setup/bin/ps-setup @@ -9,7 +9,6 @@ check_install () { setup_proxspace () { if [ "$MSYSTEM" == "MINGW64" ]; then - for pkg in $(grep "^[^#;]" /setup/packages.txt); do check_install $pkg done diff --git a/setup/setup.cmd b/setup/setup.cmd index a02e9d65f..e3113156f 100644 --- a/setup/setup.cmd +++ b/setup/setup.cmd @@ -10,7 +10,7 @@ echo %cd%\setup /setup ntfs noacl 0 0 >>%cd%\msys2/etc/fstab echo %cd%\pm3 /pm3 ntfs noacl 0 0 >>%cd%\msys2/etc/fstab dash /usr/bin/rebaseall -p 2> nul -mkdir %cd%\msys2\tmp 2> nul +::mkdir %cd%\msys2\tmp 2> nul del %cd%\msys2\etc\passwd 2> nul del %cd%\msys2\etc\group 2> nul touch /etc/passwd