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

minor fixes and checks for issues

Browse Source
This commit is contained in:
crowetic 2025-05-15 15:28:57 -07:00
parent ae8c10fd1f
commit e3bd8411ef
1 changed files with 7 additions and 5 deletions

12
auto-fix-qortal.sh

@ -395,9 +395,11 @@ potentially_update_settings() {
is_valid_json=false is_valid_json=false
if command -v jq &>/dev/null; then if command -v jq &>/dev/null; then
echo "${YELLOW}Using jq to validate JSON...${NC}" echo "${YELLOW}Using jq to validate JSON...${NC}"
if jq empty "${SETTINGS_FILE}" 2>/dev/null; then if [ -s "${SETTINGS_FILE}" ]; then
is_valid_json=true if jq empty "${SETTINGS_FILE}" 2>/dev/null; then
echo "${GREEN}settings.json is valid JSON.${NC}" is_valid_json=true
echo "${GREEN}settings.json is valid JSON.${NC}"
fi
fi fi
else else
echo "${YELLOW}jq not found, doing basic manual check...${NC}" echo "${YELLOW}jq not found, doing basic manual check...${NC}"
@ -419,7 +421,7 @@ potentially_update_settings() {
echo "${GREEN}Backup restored successfully and is valid.${NC}" echo "${GREEN}Backup restored successfully and is valid.${NC}"
else else
echo "${RED}Backup also invalid. Downloading default settings.json...${NC}" echo "${RED}Backup also invalid. Downloading default settings.json...${NC}"
curl -L -O "${SETTINGS_FILE}" "https://raw.githubusercontent.com/crowetic/QORTector-scripts/refs/heads/main/settings.json" curl -L -O "https://raw.githubusercontent.com/crowetic/QORTector-scripts/refs/heads/main/settings.json"
# Final validation # Final validation
if command -v jq &>/dev/null && jq empty "${SETTINGS_FILE}" 2>/dev/null; then if command -v jq &>/dev/null && jq empty "${SETTINGS_FILE}" 2>/dev/null; then
@ -473,7 +475,7 @@ update_script() {
echo "${YELLOW}Checking for any settings changes required...${NC}" echo "${YELLOW}Checking for any settings changes required...${NC}"
sleep 2 sleep 2
potentially_update_settings potentially_update_settings
rm -rf ${HOME}/qortal.jar ${HOME}/run.pid ${HOME}/run.log ${HOME}/remote.md5 ${HOME}/qortal/local.md5 rm -rf "${HOME}/qortal.jar" "${HOME}/run.pid" "${HOME}/run.log" "${HOME}/remote.md5" "${HOME}/qortal/local.md5"
mkdir -p ${HOME}/backups && mv ${HOME}/qortal/backup-settings* ${HOME}/backups mkdir -p ${HOME}/backups && mv ${HOME}/qortal/backup-settings* ${HOME}/backups
echo "${YELLOW}Auto-fix script run complete.${NC}\n" echo "${YELLOW}Auto-fix script run complete.${NC}\n"
sleep 5 sleep 5