From 8e75b2453b93b32dd713a231e2f8c27dcfe806ab Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 23 Apr 2020 21:36:43 +0100 Subject: [PATCH] Update scripts. --- scripts/install-linker.sh | 21 ++++++++++++++++++ scripts/lib/systemd/system/relinker.service | 4 +++- .../lib/systemd/system/relinkerhot.service | 2 +- scripts/opt/script/README | 4 ++-- scripts/opt/script/install-relinker.sh | 17 -------------- scripts/opt/script/relink-hotspot.sh | 20 ++++++++++------- scripts/opt/script/relink-repeater.sh | 15 ++++++++++--- scripts/opt/script/script.conf | 14 ++++++------ scripts/opt/script/start.sh | 5 ++++- scripts/opt/script/var-log-script.tgz | Bin 2136 -> 205 bytes scripts/var/log/script/test1.txt | 1 - scripts/var/log/script/var-log-script.tgz | Bin 2136 -> 0 bytes 12 files changed, 62 insertions(+), 41 deletions(-) create mode 100644 scripts/install-linker.sh delete mode 100644 scripts/opt/script/install-relinker.sh delete mode 100644 scripts/var/log/script/var-log-script.tgz diff --git a/scripts/install-linker.sh b/scripts/install-linker.sh new file mode 100644 index 0000000..636d7a4 --- /dev/null +++ b/scripts/install-linker.sh @@ -0,0 +1,21 @@ +#!/bin/bash + + + + +cd / +rm -rf DMRGa* +cd /opt +rm -rf script +cd /var/log +rm -rf script + +cd /boot +cp DMRGateway*.tgz / +cd / +tar -xvf DMRGateway*.tgz +systemctl daemon-reload +echo -n "" > /var/log/script/static-slot1.txt +echo -n "" > /var/log/script/static-slot2.txt +echo -n "" > /var/log/script/slot1.txt +echo -n "" > /var/log/script/slot2.txt diff --git a/scripts/lib/systemd/system/relinker.service b/scripts/lib/systemd/system/relinker.service index bd91ae7..69cb9a4 100644 --- a/scripts/lib/systemd/system/relinker.service +++ b/scripts/lib/systemd/system/relinker.service @@ -5,7 +5,9 @@ After=multi-user.target [Service] Type=idle -ExecStart=/bin/bash /opt/script/relink-repeater.sh >> /var/log/script/checkBMAPI.log 2>&1 +ExecStart=/bin/bash /opt/script/relink-repeater.sh + + [Install] diff --git a/scripts/lib/systemd/system/relinkerhot.service b/scripts/lib/systemd/system/relinkerhot.service index 4848676..4331bf1 100644 --- a/scripts/lib/systemd/system/relinkerhot.service +++ b/scripts/lib/systemd/system/relinkerhot.service @@ -5,7 +5,7 @@ After=multi-user.target [Service] Type=idle -ExecStart=/bin/bash /opt/script/relink-hotspot.sh >> /var/log/script/checkBMAPI.log 2>&1 +ExecStart=/bin/bash /opt/script/relink-hotspot.sh [Install] diff --git a/scripts/opt/script/README b/scripts/opt/script/README index e4865b7..b0e5eb2 100644 --- a/scripts/opt/script/README +++ b/scripts/opt/script/README @@ -4,7 +4,7 @@ DMR SUDO Reflector - TG -This is the first release version of the relinker scripts 3.1 +This is the first release version of the relinker scripts 3.2 @@ -48,7 +48,7 @@ Port=3769 -1. Copy the package DMRGateway-TGDynRewrite-relinker-3.1.tgz to the folder/boot and also the install-relinker.sh script supplied (you can do this with a card reader from windows if you like) +1. Copy the package DMRGateway-TGDynRewrite-relinker-3.2.tgz to the folder/boot and also the install-relinker.sh script supplied (you can do this with a card reader from windows if you like) 2. run /boot#./install-relinker which should create folders /opt/script/script and /var/log/script/various working files and logfile. it also sets up services in systemd diff --git a/scripts/opt/script/install-relinker.sh b/scripts/opt/script/install-relinker.sh deleted file mode 100644 index 0bb8850..0000000 --- a/scripts/opt/script/install-relinker.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - - - - -cd / -rm -rf DMRGa* -cd /opt -rm -rf script -cd /var/log -rm -rf script - -cd /boot -cp DMRGateway*.tgz / -cd / -tar -xvf DMRGateway*.tgz -systemctl daemon-reload diff --git a/scripts/opt/script/relink-hotspot.sh b/scripts/opt/script/relink-hotspot.sh index 4221849..c175e9a 100644 --- a/scripts/opt/script/relink-hotspot.sh +++ b/scripts/opt/script/relink-hotspot.sh @@ -3,6 +3,14 @@ source /opt/script/script.conf +exec 3>&1 4>&2 +trap 'exec 2>&4 1>&3' 0 1 2 3 +exec 1>/var/log/script/checkBMAPI.log 2>&1 + + + + + #check BM API @@ -121,7 +129,8 @@ check_if_nothing_linked_slot2(){ } - +while : +do check_BM_API echo $checkslot1 @@ -129,10 +138,5 @@ $checkslot2 $slot1notlinked $slot2notlinked echo -sleep $slowdown -/bin/bash /opt/script/relink-hotspot.sh >> /var/log/script/checkBMAPI.log 2>&1 - - - - - +sleep $slowdown +done \ No newline at end of file diff --git a/scripts/opt/script/relink-repeater.sh b/scripts/opt/script/relink-repeater.sh index d333513..6700195 100644 --- a/scripts/opt/script/relink-repeater.sh +++ b/scripts/opt/script/relink-repeater.sh @@ -3,6 +3,13 @@ source /opt/script/script.conf +exec 3>&1 4>&2 +trap 'exec 2>&4 1>&3' 0 1 2 3 +exec 1>/var/log/script/checkBMAPI.log 2>&1 + + + + #check BM API @@ -122,6 +129,9 @@ check_if_nothing_linked_slot2(){ } + +while : +do check_BM_API echo $checkslot1 @@ -129,6 +139,5 @@ $checkslot2 $slot1notlinked $slot2notlinked echo -sleep $slowdown -/bin/bash /opt/script/relink-repeater.sh >> /var/log/script/checkBMAPI.log 2>&1 - +sleep $slowdown +done diff --git a/scripts/opt/script/script.conf b/scripts/opt/script/script.conf index ab1bbf4..8736739 100644 --- a/scripts/opt/script/script.conf +++ b/scripts/opt/script/script.conf @@ -1,14 +1,14 @@ #!/usr/bin/bash -repeater=234587501 -call=M0VUB -defaultslot1=0 -defaultslot2=2350 +repeater=235192 +call=GB3IN +defaultslot1=23590 +defaultslot2=91 minrelinktimerslot1=30 minrelinktimerslot2=30 -slowdown=10 -checkslot1= +slowdown=0 +checkslot1=check_status_slot1 checkslot2=check_status_slot2 -slot1notlinked= +slot1notlinked=check_if_nothing_linked_slot1 slot2notlinked=check_if_nothing_linked_slot2 #configuration above enabled to watch slot 2 only on a hotspot diff --git a/scripts/opt/script/start.sh b/scripts/opt/script/start.sh index c56a620..5caca19 100644 --- a/scripts/opt/script/start.sh +++ b/scripts/opt/script/start.sh @@ -6,7 +6,10 @@ sleep 1 cd /var/log/script sleep 1 tar -xvf var-log-script.tgz - +echo -n "" > /var/log/script/static-slot1.txt +echo -n "" > /var/log/script/static-slot2.txt +echo -n "" > /var/log/script/slot1.txt +echo -n "" > /var/log/script/slot2.txt diff --git a/scripts/opt/script/var-log-script.tgz b/scripts/opt/script/var-log-script.tgz index 7f5a7fcc7457dc1a1a9035c6e68f6ae4d9b9c411..cac2dfb7f7cbed5b62b87387163ecc28f1e3b5f2 100644 GIT binary patch literal 205 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