crowetic/QORTector-scripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed the run check and qortal update portion of the script to properly check for qortal, then set SHOULD_UPDATE_QORTAL variable based on result.

Browse Source
This commit is contained in:
crowetic 2024-10-18 20:23:45 -07:00
parent 32f7e83282
commit 1412491d3b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
generic-linux-setup.sh
View File

@ -73,17 +73,17 @@ check_qortal_version() {
} }
download_qortal_core() { download_qortal_core() {
if ! check_qortal_version; then if [ $SHOULD_UPDATE_QORTAL -eq 0 ]; then
cd cd
if [ -d qortal ]; then if [ -d qortal ]; then
echo "${PURPLE} qortal DIRECTORY FOUND, BACKING UP ORIGINAL TO '~/backups' AND RE-INSTALLING ${NC}\n" echo "${PURPLE} qortal DIRECTORY FOUND, BACKING UP ORIGINAL TO '~/backups' AND RE-INSTALLING ${NC}\n"
mkdir -p backups mkdir -p ~/backups
mv -f qortal backups/ mv -f ~/qortal ~/backups/
fi fi
curl -L -O https://github.com/Qortal/qortal/releases/latest/download/qortal.zip curl -L -O https://github.com/Qortal/qortal/releases/latest/download/qortal.zip
unzip qortal*.zip unzip qortal*.zip
rm -rf qortal*.zip rm -rf qortal*.zip
cd qortal cd ~/qortal
rm -rf settings.json rm -rf settings.json
curl -L -O https://raw.githubusercontent.com/crowetic/QORTector-scripts/main/settings.json curl -L -O https://raw.githubusercontent.com/crowetic/QORTector-scripts/main/settings.json
chmod +x *.sh chmod +x *.sh
@ -100,7 +100,7 @@ download_qortal_ui() {
echo "${PURPLE} PREVIOUS Qortal-UI FOUND, BACKING UP ORIGINAL TO '~/backups/' AND RE-INSTALLING ${NC}\n" echo "${PURPLE} PREVIOUS Qortal-UI FOUND, BACKING UP ORIGINAL TO '~/backups/' AND RE-INSTALLING ${NC}\n"
mv ~/qortal/Qortal-UI ~/backups/ mv ~/qortal/Qortal-UI ~/backups/
fi fi
cd qortal cd ~/qortal
if [ "$ARCHITECTURE" = "aarch64" ] || [ "$ARCHITECTURE" = "arm64" ]; then if [ "$ARCHITECTURE" = "aarch64" ] || [ "$ARCHITECTURE" = "arm64" ]; then
curl -L -O https://github.com/Qortal/qortal-ui/releases/latest/download/Qortal-Setup-arm64.AppImage curl -L -O https://github.com/Qortal/qortal-ui/releases/latest/download/Qortal-Setup-arm64.AppImage
mv Qortal-Setup-arm64.AppImage Qortal-UI mv Qortal-Setup-arm64.AppImage Qortal-UI
@ -123,17 +123,17 @@ download_other_files() {
chmod +x *.sh chmod +x *.sh
curl -L -O https://cloud.qortal.org/s/6d8qoEkQRDSCTqn/download/rebuilt-machine-setup.txt curl -L -O https://cloud.qortal.org/s/6d8qoEkQRDSCTqn/download/rebuilt-machine-setup.txt
mv -f rebuilt-machine-setup.txt ~/Desktop mv -f ~/rebuilt-machine-setup.txt ~/Desktop
if [ -d ~/Pictures/wallpapers ]; then if [ -d ~/Pictures/wallpapers ]; then
echo "${PURPLE} PREVIOUS wallpapers folder FOUND, BACKING UP ORIGINAL TO '~/backups/' AND RE-INSTALLING ${NC}\n" echo "${PURPLE} PREVIOUS wallpapers folder FOUND, BACKING UP ORIGINAL TO '~/backups/' AND RE-INSTALLING ${NC}\n"
mkdir -p ~/backups mkdir -p ~/backups
mv -f ~/Pictures/wallpapers ~/backups mv -f ~/Pictures/wallpapers ~/backups/
fi fi
if [ -d ~/Pictures/icons ]; then if [ -d ~/Pictures/icons ]; then
echo "${PURPLE} PREVIOUS icons folder FOUND, BACKING UP ORIGINAL TO '~/backups/' AND RE-INSTALLING ${NC}\n" echo "${PURPLE} PREVIOUS icons folder FOUND, BACKING UP ORIGINAL TO '~/backups/' AND RE-INSTALLING ${NC}\n"
mkdir -p ~/backups mkdir -p ~/backups
mv -f ~/Pictures/icons ~/backups mv -f ~/Pictures/icons ~/backups/
fi fi
unzip Machine-files.zip unzip Machine-files.zip
@ -158,6 +158,8 @@ finish_up() {
check_distro check_distro
check_display check_display
update_and_install_packages update_and_install_packages
check_qortal_version
SHOULD_UPDATE_QORTAL=$?
download_qortal_core download_qortal_core
download_qortal_ui download_qortal_ui
download_other_files download_other_files