Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V3.9 #44

Merged
merged 16 commits into from
Apr 10, 2021
Prev Previous commit
Next Next commit
test
Gator96100 committed Apr 10, 2021

Verified

This commit was signed with the committer’s verified signature.
chelnak Craig Gumbley
commit 8832a906af99b92aa1851ab3bc2176c61790b05f
4 changes: 3 additions & 1 deletion setup/09-proxspace_setup.post
Original file line number Diff line number Diff line change
@@ -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
9 changes: 5 additions & 4 deletions setup/bin/ps-rankmirrors
Original file line number Diff line number Diff line change
@@ -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
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

1 change: 0 additions & 1 deletion setup/bin/ps-setup
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@ check_install () {
setup_proxspace ()
{
if [ "$MSYSTEM" == "MINGW64" ]; then

for pkg in $(grep "^[^#;]" /setup/packages.txt); do
check_install $pkg
done
2 changes: 1 addition & 1 deletion setup/setup.cmd
Original file line number Diff line number Diff line change
@@ -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