From 54fa5730b8b34e5951955d293eafefcfdf328bd4 Mon Sep 17 00:00:00 2001
From: RaspbianProyect by HP3ICC <setcom40@gmail.com>
Date: Sun, 12 Feb 2023 15:53:49 +0000
Subject: [PATCH] Update update.sh

---
 update.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/update.sh b/update.sh
index 6f138be..d222fbf 100644
--- a/update.sh
+++ b/update.sh
@@ -174,7 +174,11 @@ EOF
 ##
 sudo cat > /opt/fdmr-update.sh <<- "EOF"
 #!/bin/bash
-variable=$(grep "SERVER_ID:" /opt/FreeDMR/config/FreeDMR.cfg | tail -c 5)
+variable=$(grep "SERVER_ID:" /opt/FreeDMR/config/FreeDMR.cfg | grep -Eo '[0-9]{1,9}')
+if [ -z "$variable" ]
+then variable=0000
+
+fi
 sudo systemctl stop freedmr.service
 sudo systemctl stop proxy.service
 sudo systemctl stop fdmrparrot.service
@@ -197,12 +201,9 @@ sudo sed -i 's/freedmr.log/\/var\/log\/FreeDMR\/FreeDMR.log/' /opt/FreeDMR/confi
 sudo sed -i 's/ANNOUNCEMENT_LANGUAGE: en_GB/ANNOUNCEMENT_LANGUAGE: CW/' /opt/FreeDMR/config/FreeDMR.cfg
 #sudo sed -i "s/TGID_URL:/#TGID_URL:/g"  /opt/FreeDMR/config/FreeDMR.cfg 
 #sed '37 a TGID_URL: https://freedmr.cymru/talkgroups/talkgroup_ids_json.php' -i /opt/FreeDMR/config/FreeDMR.cfg 
-if [ -z "$variable" ]
-then variable=0000
-
-fi
 sudo sed -i "s/SERVER_ID: .*/SERVER_ID: $variable/g"  /opt/FreeDMR/config/FreeDMR.cfg
 
+
 rm /opt/conf.txt
 rm /opt/FreeDMR-SAMPLE.cfg