From 2705bd5df902f8d28bafe98867bc030acd9b7fa9 Mon Sep 17 00:00:00 2001 From: Keith Whyte Date: Mon, 11 May 2020 23:47:50 +0200 Subject: [PATCH] BTS: check for expect before trying install --- modules/rhizo_base/files/var/SysmoBTS/provision.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/rhizo_base/files/var/SysmoBTS/provision.sh b/modules/rhizo_base/files/var/SysmoBTS/provision.sh index 5aadea3..cc70d16 100644 --- a/modules/rhizo_base/files/var/SysmoBTS/provision.sh +++ b/modules/rhizo_base/files/var/SysmoBTS/provision.sh @@ -18,11 +18,14 @@ for bts in "${!BTS[@]}" ; do ssh $SSH_OPTS root@${BTS[$bts]} "date -s '$(date)'" ssh $SSH_OPTS root@${BTS[$bts]} "echo nameserver 1.1.1.1 > /etc/resolv.conf; echo nameserver 9.9.9.9 >> /etc/resolv.conf" scp $SSH_OPTS osmo-pcu.cfg root@${BTS[$bts]}:/etc/osmocom/osmo-pcu.cfg - ssh $SSH_OPTS root@${BTS[$bts]} "mkdir /tmp/ipk" - scp $SSH_OPTS *.ipk root@${BTS[$bts]}:/tmp/ipk/ - ssh $SSH_OPTS root@${BTS[$bts]} "opkg install /tmp/ipk/*.ipk" - ssh $SSH_OPTS root@${BTS[$bts]} "rm -r /tmp/ipk" + ssh $SSH_OPTS root@${BTS[$bts]} "expect -v 2>/dev/null" + if [ "$?" != "0" ]; then + ssh $SSH_OPTS root@${BTS[$bts]} "mkdir /tmp/ipk" + scp $SSH_OPTS *.ipk root@${BTS[$bts]}:/tmp/ipk/ + ssh $SSH_OPTS root@${BTS[$bts]} "opkg install /tmp/ipk/*.ipk" + ssh $SSH_OPTS root@${BTS[$bts]} "rm -r /tmp/ipk" + fi _modelNR=$(ssh $SSH_OPTS ${BTS[$bts]} sysmobts-util model-nr)