mirror of
https://github.com/Gator96100/ProxSpace.git
synced 2025-08-20 21:33:21 -07:00
reinstall in case ProxSpace has been moved
This commit is contained in:
parent
f5b0b45b39
commit
5a265cc30a
3 changed files with 33 additions and 20 deletions
|
@ -11,20 +11,30 @@ if [ -f /setup/bin/ps-upgrade.new ]; then
|
|||
mv /setup/bin/ps-upgrade.new /setup/bin/ps-upgrade
|
||||
fi
|
||||
|
||||
if [ \( ! -f /setup/installed64.txt -a "$MSYSTEM" == "MINGW64" \) ]; then
|
||||
if [ "$MAYBE_FIRST_START" = "true" ]; then
|
||||
if [ -f "/usr/bin/update-ca-trust" ]; then
|
||||
sh /usr/bin/update-ca-trust
|
||||
fi
|
||||
rm /var/lib/pacman/sync/*
|
||||
yes | pacman -Syuu
|
||||
exit
|
||||
else
|
||||
if [ -z "$PSSKIPRANKING" ]; then
|
||||
ps-rankmirrors
|
||||
fi
|
||||
if [ "$MSYSTEM" == "MINGW64" ]; then
|
||||
if [ -f /setup/installed ]; then
|
||||
source /setup/installed
|
||||
|
||||
yes | pacman -Suy
|
||||
ps-setup
|
||||
fi
|
||||
if [ "$PSINSTALLPATH" != "$OLDPWD" ]; then
|
||||
export PSREINSTALL=1
|
||||
ps-setup
|
||||
unset PSREINSTALL
|
||||
fi
|
||||
else
|
||||
if [ "$MAYBE_FIRST_START" = "true" ]; then
|
||||
if [ -f "/usr/bin/update-ca-trust" ]; then
|
||||
sh /usr/bin/update-ca-trust
|
||||
fi
|
||||
rm /var/lib/pacman/sync/*
|
||||
yes | pacman -Syuu
|
||||
exit
|
||||
else
|
||||
if [ -z "$PSSKIPRANKING" ]; then
|
||||
ps-rankmirrors
|
||||
fi
|
||||
|
||||
yes | pacman -Suy
|
||||
ps-setup
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -9,7 +9,8 @@ ps_print "Arch: $MSYSTEM_CARCH"
|
|||
ps_print "OS: $(wmic OS get Caption,CSDVersion,OSArchitecture,Version | awk 'NR==2')"
|
||||
ps_print "CPU: $(wmic CPU get Name | awk 'NR==2')"
|
||||
ps_print "Ram: $(wmic COMPUTERSYSTEM get TotalPhysicalMemory | awk 'NR==2')"
|
||||
ps_print "Installed64: $(cat /setup/installed64.txt)"
|
||||
ps_print "InstallDate: $PSINSTALLDATE"
|
||||
ps_print "InstallPath: $PSINSTALLPATH"
|
||||
ps_print "OLDPWD: $OLDPWD"
|
||||
ps_print "Path: $PATH"
|
||||
ps_print "arm-none-eabi-gcc: $(arm-none-eabi-gcc -dumpversion)"
|
||||
|
@ -17,4 +18,4 @@ ps_print "gcc: $(gcc -dumpversion)"
|
|||
ps_print "git: $(git --version)"
|
||||
ps_print "make: $(make -v)"
|
||||
ps_print "pkg-config: $(pkg-config --version)"
|
||||
ps_print "Qt: $(qmake --version)"
|
||||
ps_print "Qt: $(qmake --version)"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
check_install () {
|
||||
echo "Installing: $1"
|
||||
pacman -Q $1 > /dev/null
|
||||
if [ $? == 1 ]; then
|
||||
pacman -Q $1 &> /dev/null
|
||||
if [ $? == 1 ] || [ -n "$PSREINSTALL" ]; then
|
||||
pacman --noconfirm --overwrite='*' -S $1
|
||||
fi
|
||||
}
|
||||
|
@ -19,7 +19,9 @@ setup_proxspace ()
|
|||
|
||||
yes | pacman -Sc
|
||||
|
||||
echo $(date '+%Y-%m-%d %H:%M:%S') > /setup/installed64.txt
|
||||
echo "export PSINSTALLDATE=\"$(date '+%Y-%m-%d %H:%M:%S')\"" > /setup/installed
|
||||
echo "export PSINSTALLPATH=\"$OLDPWD\"" >> /setup/installed
|
||||
|
||||
fi
|
||||
}
|
||||
setup_proxspace
|
Loading…
Add table
Add a link
Reference in a new issue