ors-amarisoft: fixup for d1e5311d

playbook/roles/ors/files/configure-sudoers

@@ -15,7 +15,7 @@ for c in "${COMMAND_LIST[@]}"; do
 done
 c="sdr-util"
 SLAPUSER_LINES="$(cat /etc/sudoers.d/slapuser-$c 2> /dev/null | wc -l)"
-AMARISOFT_PATH="/opt/amarisoft/$(ls -1 /opt/amarisoft | grep "^v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}$" | sort | tail -n1)"
+AMARISOFT_PATH="/opt/amarisoft/$(ls -1 /opt/amarisoft | grep "^v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.*[0-9]*$" | sort | tail -n1)"
 if [ "$SLAPUSER_LINES" != "$PARTITION_AMOUNT" ]; then
   echo "Configuring /etc/sudoers.d/slapuser-$c..."
   for i in $(seq 0 $(($PARTITION_AMOUNT-1))); do

playbook/roles/ors/files/init-enb

 #!/bin/bash
 
-AMARISOFT_PATH="/opt/amarisoft/$(ls -1 /opt/amarisoft | grep "^v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}$" | sort | tail -n1)"
+AMARISOFT_PATH="/opt/amarisoft/$(ls -1 /opt/amarisoft | grep "^v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.*[0-9]*$" | sort | tail -n1)"
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH"
 
 $AMARISOFT_PATH/enb/lte_init.sh;

playbook/roles/ors/files/init-mme

 #!/bin/bash
 
-AMARISOFT_PATH="/opt/amarisoft/$(ls -1 /opt/amarisoft | grep "^v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}$" | sort | tail -n1)"
+AMARISOFT_PATH="/opt/amarisoft/$(ls -1 /opt/amarisoft | grep "^v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.*[0-9]*$" | sort | tail -n1)"
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH"
 
 $AMARISOFT_PATH/mme/lte_init.sh;

playbook/roles/ors/files/init-sdr

 #!/bin/bash
 
-OLD_AMARISOFT_PATH="/opt/amarisoft/$(ls -1 /opt/amarisoft | grep "^v2021-[0-9]\{2\}-[0-9]\{2\}.[0-9]*$" | sort | tail -n1)"
-AMARISOFT_PATH="/opt/amarisoft/$(ls -1 /opt/amarisoft | grep "^v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.[0-9]*$" | sort | tail -n1)"
+OLD_AMARISOFT_PATH="/opt/amarisoft/$(ls -1 /opt/amarisoft | grep "^v2021-[0-9]\{2\}-[0-9]\{2\}.*[0-9]*$" | sort | tail -n1)"
+AMARISOFT_PATH="/opt/amarisoft/$(ls -1 /opt/amarisoft | grep "^v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.*[0-9]*$" | sort | tail -n1)"
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH"
 
 $AMARISOFT_PATH/trx_sdr/sdr_util version && exit;

playbook/roles/ors/tasks/main.yml

@@ -14,7 +14,7 @@
     when: (monitor_path is succeeded) and (playbook_report | bool)
 
   - name: Check Amarisoft version
-    shell: 'find /opt/amarisoft -maxdepth 1 | grep "^/opt/amarisoft/v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.[0-9]*$" | cut -d/ -f4 | sort | tail -n1'
+    shell: 'find /opt/amarisoft -maxdepth 1 | grep "^/opt/amarisoft/v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.*[0-9]*$" | cut -d/ -f4 | sort | tail -n1'
     register: amarisoft_version
     ignore_errors: yes
 
@@ -101,7 +101,7 @@
     copy: src=rm-tmp-lte dest=/opt/amarisoft owner=root mode=770
 
   - name: Get Amarisoft path
-    shell: 'find /opt/amarisoft -maxdepth 1 | grep "^/opt/amarisoft/v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.[0-9]*$" | sort | tail -n1'
+    shell: 'find /opt/amarisoft -maxdepth 1 | grep "^/opt/amarisoft/v[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.*[0-9]*$" | sort | tail -n1'
     register: amarisoft_path
 
   - name: Check if lteenb has capabilities