diff --git a/update.sh b/update.sh index a20dd1d..5bdb5c5 100644 --- a/update.sh +++ b/update.sh @@ -306,7 +306,14 @@ echo "${commands}" | /usr/bin/mysql -u root /usr/bin/python3 -m pip install --upgrade spyne ############### cd / -variable=$(grep "SERVER_ID:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -Eo '[0-9]{1,9}') +if [ -f "/opt/FreeDMR/config/FreeDMR.cfg" ] +then + variable=$(grep "SERVER_ID:" /opt/FreeDMR/config/FreeDMR.cfg | grep -Eo '[0-9]{1,9}') +fi +if [ -f "/opt/ADN-DMR-Peer-Server/config/adn.cfg" ] +then + variable=$(grep "SERVER_ID:" /opt/ADN-DMR-Peer-Server/config/adn.cfg | grep -Eo '[0-9]{1,9}') +fi if [ -z "$variable" ] then variable=0000 @@ -421,7 +428,8 @@ then fi #### cp /opt/ADN-DMR-Peer-Server/config/ADN-SAMPLE.cfg /opt/ADN-DMR-Peer-Server/config/adn.cfg -sudo sed -i "s/SERVER_ID: .*/SERVER_ID: $variable/g" /opt/ADN-DMR-Peer-Server/config/adn.cfg +sudo sed -i "s/SERVER_ID:.*/SERVER_ID: $variable/g" /opt/ADN-DMR-Peer-Server/config/adn.cfg +sudo cat /opt/obp.txt >> /opt/ADN-DMR-Peer-Server/config/adn.cfg cd /opt/ADN-DMR-Peer-Server/ @@ -447,6 +455,7 @@ sed -i "s/54100/56499/g" /opt/ADN-DMR-Peer-Server/hotspot_proxy_v2.py sed -i "s/1234567/1234567,1231237,123123701/g" /opt/ADN-DMR-Peer-Server/proxy.cfg #sed -i '228s/20/50/' /opt/ADN-DMR-Peer-Server/hotspot_proxy_v2.py ################# + sudo chmod +x /opt/ADN-DMR-Peer-Server/*.py #sudo chmod +x /opt/ADN-DMR-Peer-Server/config/*.py sh /opt/extra-1.sh