From d4ba6cd68881b760d08f0ea2a1339fec069b655a Mon Sep 17 00:00:00 2001
From: Steve Miller <43918257+kc1awv@users.noreply.github.com>
Date: Thu, 2 Jul 2020 09:14:08 -0400
Subject: [PATCH 1/4] Update DMRIDUpdate.sh

Update file to new address for RadioID
---
 usr/local/sbin/DMRIDUpdate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/sbin/DMRIDUpdate.sh b/usr/local/sbin/DMRIDUpdate.sh
index da05fb3..efd13df 100755
--- a/usr/local/sbin/DMRIDUpdate.sh
+++ b/usr/local/sbin/DMRIDUpdate.sh
@@ -94,7 +94,7 @@ then
 fi
 
 # Generate new file
-curl -s -N "https://www.radioid.net/api/dmr/user/?id=%" | jq -r '.results[] | [.id, .callsign, .fname] | @csv' | sed -e 's/"//g' | sed -e 's/,/ /g' > ${DMRIDFILE}
+curl -s -N "https://database.radioid.net/api/dmr/user/?id=%" | jq -r '.results[] | [.id, .callsign, .fname] | @csv' | sed -e 's/"//g' | sed -e 's/,/ /g' > ${DMRIDFILE}
 
 # Restart YSF2DMR & mmdmvhost
 #eval ${RESTARTCOMMAND2}

From d595071f05e23d03a8bede8a97aa063c755e955d Mon Sep 17 00:00:00 2001
From: Steve Miller <43918257+kc1awv@users.noreply.github.com>
Date: Thu, 2 Jul 2020 09:16:19 -0400
Subject: [PATCH 2/4] Update DMRIDUpdateBM.sh

Update file to new address for RadioID
---
 usr/local/sbin/DMRIDUpdateBM.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/sbin/DMRIDUpdateBM.sh b/usr/local/sbin/DMRIDUpdateBM.sh
index 480dc60..7ee2061 100755
--- a/usr/local/sbin/DMRIDUpdateBM.sh
+++ b/usr/local/sbin/DMRIDUpdateBM.sh
@@ -96,7 +96,7 @@ then
 fi
 
 # Generate new file
-curl -s -N "https://www.radioid.net/api/dmr/user/?id=%" | jq -r '.results[] | [.id, .callsign, .fname] | @csv' | sed -e 's/"//g' > ${DMRIDFILE}
+curl -s -N "https://database.radioid.net/api/dmr/user/?id=%" | jq -r '.results[] | [.id, .callsign, .fname] | @csv' | sed -e 's/"//g' > ${DMRIDFILE}
 
 # Restart MMDVMHost
 eval ${RESTARTCOMMAND}

From d1571e54bea92bc9a1bdef242e7ccedf7c3d3ce3 Mon Sep 17 00:00:00 2001
From: Steve Miller <43918257+kc1awv@users.noreply.github.com>
Date: Thu, 2 Jul 2020 09:24:43 -0400
Subject: [PATCH 3/4] Update HBIDUpdate.sh

Update file to new address for RadioID
This should fix issue #1
---
 usr/local/sbin/HBIDUpdate.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/local/sbin/HBIDUpdate.sh b/usr/local/sbin/HBIDUpdate.sh
index a652069..e942450 100755
--- a/usr/local/sbin/HBIDUpdate.sh
+++ b/usr/local/sbin/HBIDUpdate.sh
@@ -6,6 +6,6 @@
 #                                                 #
 ###################################################
 
-curl -s -N https://www.radioid.net/api/dmr/user/?id=% | jq -r '.results[] | [.id, .callsign, .fname] | @csv' | sed -e 's/"//g' > /var/lib/dvswitch/subscriber_ids.csv
+curl -s -N https://database.radioid.net/api/dmr/user/?id=% | jq -r '.results[] | [.id, .callsign, .fname] | @csv' | sed -e 's/"//g' > /var/lib/dvswitch/subscriber_ids.csv
 
-curl -s -N https://www.radioid.net/static/rptrids_simple_cbridge.csv | sed 's/- //g' | sed 's/,.*//g' | sed -r 's/([a-zA-Z0-9]+) ([a-zA-Z0-9]+)/\2 \1/g' > /var/lib/dvswitch/peer_ids.csv
+curl -s -N https://database.radioid.net/static/cbridge_simple_rptr.csv | sed 's/- //g' | sed 's/,.*//g' | sed -r 's/([a-zA-Z0-9]+) ([a-zA-Z0-9]+)/\2 \1/g' > /var/lib/dvswitch/peer_ids.csv

From c0578355ef1e22620d689e92e3c22e9061450690 Mon Sep 17 00:00:00 2001
From: Steve Miller <43918257+kc1awv@users.noreply.github.com>
Date: Thu, 2 Jul 2020 09:27:01 -0400
Subject: [PATCH 4/4] Update NXDNIDUpdate.sh

Update file to new address for RadioID
---
 usr/local/sbin/NXDNIDUpdate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/sbin/NXDNIDUpdate.sh b/usr/local/sbin/NXDNIDUpdate.sh
index bb9603e..81d9522 100755
--- a/usr/local/sbin/NXDNIDUpdate.sh
+++ b/usr/local/sbin/NXDNIDUpdate.sh
@@ -6,4 +6,4 @@
 #                                                 #
 ###################################################
 
-curl -s -N https://www.radioid.net/api/nxdn/user/?id=% | jq -r '.results[] | [.id, .callsign, .fname] | @csv' | sed -e 's/"//g' > /var/lib/mmdvm/nxdn.csv
+curl -s -N https://database.radioid.net/api/nxdn/user/?id=% | jq -r '.results[] | [.id, .callsign, .fname] | @csv' | sed -e 's/"//g' > /var/lib/mmdvm/nxdn.csv