Update update.sh

update.sh

@@ -552,22 +552,32 @@ sudo sed -i 's/KEYS_FILE:.*/KEYS_FILE: keys.json/' /opt/FreeDMR/FreeDMR-SAMPLE.c
 else
 sudo sed '45 a KEYS_FILE: keys.json' -i /opt/FreeDMR/FreeDMR-SAMPLE.cfg 
 fi
-sed -i "s/SUB_MAP_FILE:.*/SUB_MAP_FILE: sub_map.pkl/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+if [ "$(cat /opt/FreeDMR/FreeDMR-SAMPLE.cfg | grep 'STALE_TIME')" != "" ]; then
-sed -i "s/ANNOUNCEMENT_LANGUAGE:.*/ANNOUNCEMENT_LANGUAGE: es_ES/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sudo sed -i 's/STALE_TIME:.*/STALE_TIME: 1/' /opt/FreeDMR/FreeDMR-SAMPLE.cfg
-sed -i "s/SINGLE_MODE:.*/SINGLE_MODE: False/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+else
-sed -i "s/VOICE_IDENT:.*/VOICE_IDENT: False/g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sudo sed '38 a STALE_TIME: 1' -i /opt/FreeDMR/FreeDMR-SAMPLE.cfg 
-#sed -i "s/VALIDATE_SERVER_IDS:.*/VALIDATE_SERVER_IDS: False/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+fi
-sed -i "s/ALLOW_UNREG_ID:.*/ALLOW_UNREG_ID: True/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|ANNOUNCEMENT_LANGUAGE:.*|ANNOUNCEMENT_LANGUAGE: es_ES|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
-sed -i "s/PROXY_CONTROL:.*/PROXY_CONTROL: False/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|SINGLE_MODE:.*|SINGLE_MODE: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
-sed -i "s/54000/56400/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|VOICE_IDENT:.*|VOICE_IDENT: False|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
-#sed -i "s/TRY_DOWNLOAD:.*/TRY_DOWNLOAD: False/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+#sed -i "s|VALIDATE_SERVER_IDS:.*|VALIDATE_SERVER_IDS: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
-#sed -i "s/CHECKSUM_URL:.*/CHECKSUM_URL:/g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|ALLOW_UNREG_ID:.*|ALLOW_UNREG_ID: True|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
-#sed -i "s/CHECKSUM_FILE:.*/CHECKSUM_FILE:/g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|PROXY_CONTROL:.*|PROXY_CONTROL: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
-sed -i "s/SUBSCRIBER_FILE:.*/SUBSCRIBER_FILE: user.json/g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|54000/56400|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
-sed -i "s/SUBSCRIBER_URL:.*/SUBSCRIBER_URL: http:\/\/datafiles.ddns.net:8888\/user.json/g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+#sed -i "s|TRY_DOWNLOAD:.*|TRY_DOWNLOAD: False|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
-sed -i "s/TGID_URL:.*/TGID_URL: http:\/\/datafiles.ddns.net:8888\/talkgroup_ids.json/g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|PEER_FILE:.*|PEER_FILE: peer_ids.json|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
-sed -i "s/PEER_FILE:.*/PEER_FILE: rptrs.json/g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|SUBSCRIBER_FILE:.*|SUBSCRIBER_FILE: subscriber_ids.json|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
-sed -i "s/PEER_URL:.*/PEER_URL: https:\/\/database.radioid.net\/static\/rptrs.json/g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|TGID_FILE:.*|TGID_FILE: talkgroup_ids.json|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|PEER_URL:.*|PEER_URL: https://freedmr-lh.gb7fr.org.uk/json/peer_ids.json|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|SUBSCRIBER_URL:.*|SUBSCRIBER_URL: https://freedmr-lh.gb7fr.org.uk/json/subscriber_ids.json|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|TGID_URL:.*|TGID_URL: https://freedmr-lh.gb7fr.org.uk/json/talkgroup_ids.json|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|STALE_TIME:.*|STALE_TIME: 1|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|SUB_MAP_FILE:.*|SUB_MAP_FILE: sub_map.pkl|g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|LOCAL_SUBSCRIBER_FILE:.*|LOCAL_SUBSCRIBER_FILE: local_subscribers.json|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|SERVER_ID_URL:.*|SERVER_ID_URL: https://freedmr-lh.gb7fr.org.uk/json/server_ids.tsv|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+sed -i "s|SERVER_ID_FILE:.*|SERVER_ID_FILE: server_ids.tsv|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+#sed -i "s|CHECKSUM_URL:.*|CHECKSUM_URL: |g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
+#sed -i "s|CHECKSUM_FILE:.*|CHECKSUM_FILE:|g"  /opt/FreeDMR/FreeDMR-SAMPLE.cfg
 cp /opt/FreeDMR/FreeDMR-SAMPLE.cfg /opt/FreeDMR-SAMPLE.cfg
 cd /opt/
 sudo cat FreeDMR-SAMPLE.cfg conf.txt obp.txt >> /opt/FreeDMR/config/FreeDMR.cfg