Fixing onos-uninstall to be idempotent.
Fixing toms & andrea cells to by default use secure CLI access.
Change-Id: Icf951de4cad396fa3925b397270aedfb320b8855
diff --git a/tools/test/bin/onos-uninstall b/tools/test/bin/onos-uninstall
index 11e5ba2..ff8ff53 100755
--- a/tools/test/bin/onos-uninstall
+++ b/tools/test/bin/onos-uninstall
@@ -34,9 +34,12 @@
[ -z \"\$(ps -ef | grep karaf.jar | grep -v grep)\" ] && break
sleep 1
done
- [ -z \"\$(ps -ef | grep karaf.jar | grep -v grep)\" ] || echo 'ONOS failed to stop.'
+ [ -z \"\$(ps -ef | grep karaf.jar | grep -v grep)\" ] || \
+ (echo 'ONOS failed to stop.'; status=1)
# Remove onos directory and init file
- sudo rm -fr $ONOS_INSTALL_DIR
- [ -f /etc/init/onos.conf ] && sudo rm /etc/init/onos.conf
+ [ -d $ONOS_INSTALL_DIR ] && sudo rm -fr $ONOS_INSTALL_DIR
+ [ -f /etc/init/onos.conf ] && sudo rm -f /etc/init/onos.conf
+
+ exit \${status:-0};
"