[COMMON] Fix $BASH_SOURCE and pushd/popd bashisms

[oom.git] / kubernetes / contrib / dns-server-for-vhost-ingress-testing / deploy_dns.sh

diff --git a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
index 657b5f9..163877d 100755 (executable)
--- a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
+++ b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -e
-#
+
 #   Copyright 2020 Samsung Electronics Co., Ltd.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -70,7 +70,8 @@ ingress_controller_ip() {
 
 deploy() {
        local ingress_ip=$(ingress_controller_ip)
-       pushd "$SPATH/bind9dns" > /dev/null
+       initdir = $(pwd)
+       cd $SPATH/bind9dns
        if [ $# -eq 0 ]; then
                local cl_domain="simpledemo.onap.org"
        else
@@ -82,13 +83,15 @@ deploy() {
                shift
        fi
        helm install . --set dnsconf.wildcard="$cl_domain=$ingress_ip" $@
-       popd > /dev/null
+       cd $initdir
        target_machine_notice_info
 }
 
-if [[ $# -eq 1 ]] && [[ $1 == "-h" || $1 == "--help" ]]; then
+if [ $# -eq 1 ] && [ "$1" = "-h" ]; then
+       usage
+elif [ $# -eq 1 ] && [ "$1" = "--help" ]; then
        usage
-elif [[ $# -eq 1 ]] && [[ $1 == "--info" ]]; then
+elif [ $# -eq 1 ] && [ "$1" = "--info" ]; then
        target_machine_notice_info
 else
        deploy $@