This commit is contained in:
Gator96100 2021-04-10 02:44:25 +02:00
commit 8832a906af
4 changed files with 9 additions and 7 deletions

View file

@ -4,6 +4,8 @@ export PS1='\[\033]0;ProxSpace v$PSVERSION - $MSYSTEM:\w\007\033[32m\]pm3 \[\033
export PATH=/setup/bin:$PATH export PATH=/setup/bin:$PATH
alias ls='ls -hF --color=auto' alias ls='ls -hF --color=auto'
if [ -f /setup/bin/ps-upgrade.new ]; then if [ -f /setup/bin/ps-upgrade.new ]; then
rm /setup/bin/ps-upgrade rm /setup/bin/ps-upgrade
mv /setup/bin/ps-upgrade.new /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 sh /usr/bin/update-ca-trust
fi fi
yes | pacman -Syuu yes | pacman -Syuu
else else
if [ -z "$PSSKIPRANKING" ]; then if [ -z "$PSSKIPRANKING" ]; then
ps-rankmirrors ps-rankmirrors
fi fi

View file

@ -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 cp /etc/pacman.d/mirrorlist.mingw64 /etc/pacman.d/mirrorlist.mingw64.backup
fi fi
#echo "Ranking msys mirrors" echo "Ranking msys mirrors"
#rankmirrors -v --repo msys /etc/pacman.d/mirrorlist.msys.backup | tee /etc/pacman.d/mirrorlist.msys rankmirrors -v --repo msys /etc/pacman.d/mirrorlist.msys.backup | tee /etc/pacman.d/mirrorlist.msys
#echo "Ranking mingw64 mirrors" echo "Ranking mingw64 mirrors"
#rankmirrors -v --repo mingw64 /etc/pacman.d/mirrorlist.mingw64.backup | tee /etc/pacman.d/mirrorlist.mingw64 rankmirrors -v --repo mingw64 /etc/pacman.d/mirrorlist.mingw64.backup | tee /etc/pacman.d/mirrorlist.mingw64

View file

@ -9,7 +9,6 @@ check_install () {
setup_proxspace () setup_proxspace ()
{ {
if [ "$MSYSTEM" == "MINGW64" ]; then if [ "$MSYSTEM" == "MINGW64" ]; then
for pkg in $(grep "^[^#;]" /setup/packages.txt); do for pkg in $(grep "^[^#;]" /setup/packages.txt); do
check_install $pkg check_install $pkg
done done

View file

@ -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 echo %cd%\pm3 /pm3 ntfs noacl 0 0 >>%cd%\msys2/etc/fstab
dash /usr/bin/rebaseall -p 2> nul 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\passwd 2> nul
del %cd%\msys2\etc\group 2> nul del %cd%\msys2\etc\group 2> nul
touch /etc/passwd touch /etc/passwd