[#480,!245] Some bugs in scripts fixed.

diff --git a/src/bin/admin/admin-utils.sh b/src/bin/admin/admin-utils.sh
index 7ecab1be157b643a4ef041b2737f65f2987ff18f..c441e7b7e6af5e7815f2fdacdb663079ae767bf2 100644 (file)
--- a/src/bin/admin/admin-utils.sh
+++ b/src/bin/admin/admin-utils.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 # Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 3d391df1a1c52bfa6c0f87d64232f2e88418dd21..e971cdcb354961597d245c2eca7ca6e01b69ca4a 100644 (file)
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -556,7 +556,7 @@ shift
 
 # Second, check what's the backend
 backend=${1}
-if [ -z ${backend} ]; then
+if [ -z "${backend}" ]; then
     log_error "missing backend"
     usage
     exit 1
@@ -577,7 +577,7 @@ do
         -h|--host)
             shift
             db_host=${1}
-            if [ -z ${db_host} ]; then
+            if [ -z "${db_host}" ]; then
                 log_error "-h or --host requires a parameter"
                 usage
                 exit 1
@@ -587,7 +587,7 @@ do
         -u|--user)
             shift
             db_user=${1}
-            if [ -z ${db_user} ]; then
+            if [ -z "${db_user}" ]; then
                 log_error "-u or --user requires a parameter"
                 usage
                 exit 1
@@ -597,7 +597,7 @@ do
         -p|--password)
             shift
             db_password=${1}
-            if [ -z ${db_password} ]; then
+            if [ -z "${db_password}" ]; then
                 log_error "-p or --password requires a parameter"
                 usage
                 exit 1
@@ -607,7 +607,7 @@ do
         -n|--name)
             shift
             db_name=${1}
-            if [ -z ${db_name} ]; then
+            if [ -z "${db_name}" ]; then
                 log_error "-n or --name requires a parameter"
                 usage
                 exit 1
@@ -616,7 +616,7 @@ do
         -d|--directory)
             shift
             scripts_dir=${1}
-            if [ -z ${scripts_dir} ]; then
+            if [ -z "${scripts_dir}" ]; then
                 log_error "-d or --directory requires a parameter"
                 usage
                 exit 1
@@ -644,7 +644,7 @@ do
         -o|--output)
             shift
             dump_file=${1}
-            if [ -z ${dump_file} ]; then
+            if [ -z "${dump_file}" ]; then
                 log_error "-o or --output requires a parameter"
                 usage
                 exit 1

diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in
index 4c559b256fbceff4fb73e5aec0e27edf8ab55aeb..540bf815cfb1aaa248551993b17348ee6dd371cb 100644 (file)
--- a/src/bin/keactrl/keactrl.in
+++ b/src/bin/keactrl/keactrl.in
@@ -548,4 +548,3 @@ ${args}" 1
         log_error "Invalid command:  ${command}."
         exit 1 ;;
 esac
-fi