diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing index 661c414b5342d7d6a11d5393a902cd0eb6f5763b..94314de8850aa3507f0c7de7481ffd235078bc6b 100755 --- a/src/freedombone-app-syncthing +++ b/src/freedombone-app-syncthing @@ -291,16 +291,18 @@ function upgrade_syncthing { for d in /home/*/ ; do USERNAME=$(echo "$d" | awk -F '/' '{print $3}') - if grep -q 'minDiskFree unit' "/home/$USERNAME/.config/syncthing/config.xml"; then - if ! grep -q "minDiskFree unit=\"%\">$SYNCTHING_MIN_DISK_SPACE_FREE_PERCENT<" "/home/$USERNAME/.config/syncthing/config.xml"; then - sed -i "s|minDiskFree unit=.*|minDiskFree unit=\"%\">$SYNCTHING_MIN_DISK_SPACE_FREE_PERCENT</minDiskFree>|g" "/home/$USERNAME/.config/syncthing/config.xml" - syncthing_users_changed=1 + if [ -f "/home/$USERNAME/.config/syncthing/config.xml" ]; then + if grep -q 'minDiskFree unit' "/home/$USERNAME/.config/syncthing/config.xml"; then + if ! grep -q "minDiskFree unit=\"%\">$SYNCTHING_MIN_DISK_SPACE_FREE_PERCENT<" "/home/$USERNAME/.config/syncthing/config.xml"; then + sed -i "s|minDiskFree unit=.*|minDiskFree unit=\"%\">$SYNCTHING_MIN_DISK_SPACE_FREE_PERCENT</minDiskFree>|g" "/home/$USERNAME/.config/syncthing/config.xml" + syncthing_users_changed=1 + fi fi - fi - if grep -q '<minDiskFreePct>' "/home/$USERNAME/.config/syncthing/config.xml"; then - sed -i "s|<minDiskFreePct>.*|<minDiskFreePct>$SYNCTHING_MIN_DISK_SPACE_FREE_PERCENT</minDiskFreePct>|g" "/home/$USERNAME/.config/syncthing/config.xml" - syncthing_users_changed=1 + if grep -q '<minDiskFreePct>' "/home/$USERNAME/.config/syncthing/config.xml"; then + sed -i "s|<minDiskFreePct>.*|<minDiskFreePct>$SYNCTHING_MIN_DISK_SPACE_FREE_PERCENT</minDiskFreePct>|g" "/home/$USERNAME/.config/syncthing/config.xml" + syncthing_users_changed=1 + fi fi done diff --git a/src/freedombone-syncthing b/src/freedombone-syncthing index 15bc48fa2ceb1fa71c2b98034279b82457ea2a87..2695b3583d50b2293c5524a24332e5732d7d50f2 100755 --- a/src/freedombone-syncthing +++ b/src/freedombone-syncthing @@ -282,6 +282,20 @@ function user_devices_changed { CHANGED=1 fi + if [ -f "/home/$USERNAME/.config/syncthing/config.xml" ]; then + if grep -q 'minDiskFree unit' "/home/$USERNAME/.config/syncthing/config.xml"; then + if ! grep -q "minDiskFree unit=\"%\">$SYNCTHING_MIN_DISK_SPACE_FREE_PERCENT<" "/home/$USERNAME/.config/syncthing/config.xml"; then + sed -i "s|minDiskFree unit=.*|minDiskFree unit=\"%\">$SYNCTHING_MIN_DISK_SPACE_FREE_PERCENT</minDiskFree>|g" "/home/$USERNAME/.config/syncthing/config.xml" + CHANGED=1 + fi + fi + + if grep -q '<minDiskFreePct>' "/home/$USERNAME/.config/syncthing/config.xml"; then + sed -i "s|<minDiskFreePct>.*|<minDiskFreePct>$SYNCTHING_MIN_DISK_SPACE_FREE_PERCENT</minDiskFreePct>|g" "/home/$USERNAME/.config/syncthing/config.xml" + CHANGED=1 + fi + fi + if [ -f "/home/$USERNAME/$SYNCTHING_USER_IDS_FILE" ]; then while read -r line || [[ -n "$line" ]]; do if [[ $line != *"#"* && $line != *"*"* && $line != *'/'* && $line == *"-"* ]]; then