diff --git a/install.sh b/install.sh index 00c61bd..4b27ca2 100644 --- a/install.sh +++ b/install.sh @@ -303,21 +303,22 @@ VOICE_IDENT: False EOF ## -if [ "$(cat /opt/FreeDMR/FreeDMR-SAMPLE.cfg | grep 'TOPO_FILE')" != "" ]; then -sed -i 's/TOPO_FILE:.*/TOPO_FILE: topography.json/' /opt/FreeDMR/FreeDMR-SAMPLE.cfg +if [ "$(cat /opt/FreeDMR/FreeDMR-SAMPLE.cfg | grep 'KEYS_FILE')" != "" ]; then +sudo sed -i 's/KEYS_FILE:.*/KEYS_FILE: keys.json/' /opt/FreeDMR/FreeDMR-SAMPLE.cfg else -sed '45 a TOPO_FILE: topography.json' -i /opt/FreeDMR/FreeDMR-SAMPLE.cfg +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 sed -i "s/ANNOUNCEMENT_LANGUAGE:.*/ANNOUNCEMENT_LANGUAGE: es_ES/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s/SINGLE_MODE:.*/SINGLE_MODE: False/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s/VOICE_IDENT:.*/VOICE_IDENT: 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/VALIDATE_SERVER_IDS:.*/VALIDATE_SERVER_IDS: False/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/PROXY_CONTROL:.*/PROXY_CONTROL: False/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg sed -i "s/54000/56400/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg #sed -i "s/TRY_DOWNLOAD:.*/TRY_DOWNLOAD: False/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 +#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 sed -i "s/SUBSCRIBER_FILE:.*/SUBSCRIBER_FILE: user.json/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/TGID_URL:.*/TGID_URL: http:\/\/datafiles.ddns.net:8888\/talkgroup_ids.json/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg diff --git a/update.sh b/update.sh index 4353746..bf244da 100644 --- a/update.sh +++ b/update.sh @@ -567,7 +567,7 @@ sed -i "s/SUBSCRIBER_FILE:.*/SUBSCRIBER_FILE: user.json/g" /opt/FreeDMR/FreeDMR sed -i "s/SUBSCRIBER_URL:.*/SUBSCRIBER_URL: http:\/\/datafiles.ddns.net:8888\/user.json/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: rptrs.json/g" /opt/FreeDMR/FreeDMR-SAMPLE.cfg -sed -i "s/EER_URL:.*/PEER_URL: https:\/\/database.radioid.net\/static\/rptrs.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 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