From 3b2f1e7a306c4a05d6708ca91a18113e5dbde206 Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Fri, 19 Feb 2016 09:08:57 +1000 Subject: [PATCH 1/2] Fix typo in useConfig Fixes: e48bd5b830a16fc5f30deb19a880b9443705259b Add configfile name to list-instances --- tools/arkmanager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/arkmanager b/tools/arkmanager index afb13ac..a74ce69 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -1646,7 +1646,7 @@ useConfig() { break fi done - if [ -a "$configfile" ]; then + if [ -z "$configfile" ]; then echo "Error: config file ${configfile} does not exist" exit 1 fi From fdc7bffb6b0d077368dd51b797fbcee37e1cfa2c Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Fri, 19 Feb 2016 09:13:35 +1000 Subject: [PATCH 2/2] Fix logic error in configfile test --- tools/arkmanager | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/arkmanager b/tools/arkmanager index a74ce69..ba52c1e 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -1647,7 +1647,11 @@ useConfig() { fi done if [ -z "$configfile" ]; then - echo "Error: config file ${configfile} does not exist" + echo "Error: no config files for instance $1" + exit 1 + fi + if [ ! -f "$configfile" ]; then + echo "Error: config file $configfile does not exist" exit 1 fi source "$configfile"