From 92003cdb16ed313773ba2e39dc13a1fe55e5bbee Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Sun, 15 Mar 2015 11:29:48 +0100 Subject: [PATCH] labs: make TOP_DIR more robust with blanks in path Make TOP_DIR more robust when blanks are part of the TOP_DIR path. Change-Id: I868e3406f358da24049d1e1bdbb4a8197f294a63 --- labs/osbash.sh | 2 +- labs/scripts/config_external_network.sh | 2 +- labs/scripts/config_tenant_network.sh | 2 +- labs/scripts/etc_hosts.sh | 2 +- labs/scripts/osbash/activate_autostart.sh | 2 +- labs/scripts/osbash/base_fixups.sh | 2 +- labs/scripts/osbash/enable_osbash_ssh_keys.sh | 2 +- labs/scripts/osbash/init_xxx_node.sh | 2 +- labs/scripts/osbash/wait_debug.sh | 2 +- labs/scripts/setup_lbaas_controller.sh | 2 +- labs/scripts/shutdown.sh | 2 +- labs/scripts/shutdown_controller.sh | 2 +- labs/scripts/ubuntu/apt_init.sh | 2 +- labs/scripts/ubuntu/apt_install_mysql.sh | 2 +- labs/scripts/ubuntu/apt_pre-download.sh | 2 +- labs/scripts/ubuntu/apt_upgrade.sh | 2 +- labs/scripts/ubuntu/install_rabbitmq.sh | 2 +- labs/scripts/ubuntu/setup_cinder_controller.sh | 2 +- labs/scripts/ubuntu/setup_cinder_volumes.sh | 2 +- labs/scripts/ubuntu/setup_glance.sh | 2 +- labs/scripts/ubuntu/setup_horizon.sh | 2 +- labs/scripts/ubuntu/setup_keystone.sh | 2 +- labs/scripts/ubuntu/setup_lbaas_network.sh | 2 +- labs/scripts/ubuntu/setup_neutron_compute.sh | 2 +- labs/scripts/ubuntu/setup_neutron_controller.sh | 2 +- labs/scripts/ubuntu/setup_neutron_network.sh | 2 +- labs/scripts/ubuntu/setup_nova_compute.sh | 2 +- labs/scripts/ubuntu/setup_nova_controller.sh | 2 +- labs/scripts/yum_init.sh | 2 +- labs/scripts/yum_update.sh | 2 +- labs/scripts/zero_empty.sh | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/labs/osbash.sh b/labs/osbash.sh index 48958d25..39d92908 100755 --- a/labs/osbash.sh +++ b/labs/osbash.sh @@ -6,7 +6,7 @@ set -o nounset # Kill entire process group trap 'kill -- -$$' SIGINT -TOP_DIR=$(cd $(dirname "$0") && pwd) +TOP_DIR=$(cd "$(dirname "$0")" && pwd) : ${DISTRO:=ubuntu-14.04-server-amd64} diff --git a/labs/scripts/config_external_network.sh b/labs/scripts/config_external_network.sh index 557a94b5..cf416408 100755 --- a/labs/scripts/config_external_network.sh +++ b/labs/scripts/config_external_network.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/config_tenant_network.sh b/labs/scripts/config_tenant_network.sh index 6bfb2229..71266f8f 100755 --- a/labs/scripts/config_tenant_network.sh +++ b/labs/scripts/config_tenant_network.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/etc_hosts.sh b/labs/scripts/etc_hosts.sh index fa1fdc39..252864bf 100755 --- a/labs/scripts/etc_hosts.sh +++ b/labs/scripts/etc_hosts.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/osbash/activate_autostart.sh b/labs/scripts/osbash/activate_autostart.sh index f5bb8ebf..a5df70d5 100755 --- a/labs/scripts/osbash/activate_autostart.sh +++ b/labs/scripts/osbash/activate_autostart.sh @@ -7,7 +7,7 @@ set -o errexit -o nounset # Remove files that called us (written by {ks,preseed}.cfg) rm -f /etc/init.d/osbash /etc/rc2.d/S40osbash -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" # source_deploy doesn't work here source "$CONFIG_DIR/deploy.osbash" diff --git a/labs/scripts/osbash/base_fixups.sh b/labs/scripts/osbash/base_fixups.sh index 84ff7437..9071a4a1 100755 --- a/labs/scripts/osbash/base_fixups.sh +++ b/labs/scripts/osbash/base_fixups.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/osbash/enable_osbash_ssh_keys.sh b/labs/scripts/osbash/enable_osbash_ssh_keys.sh index f1112a94..13fae089 100755 --- a/labs/scripts/osbash/enable_osbash_ssh_keys.sh +++ b/labs/scripts/osbash/enable_osbash_ssh_keys.sh @@ -4,7 +4,7 @@ set -o errexit -o nounset # This script installs the insecure osbash ssh keys. This allows users to # log into the VMs using these keys instead of a password. -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/osbash/init_xxx_node.sh b/labs/scripts/osbash/init_xxx_node.sh index 684cf2a5..6907a116 100755 --- a/labs/scripts/osbash/init_xxx_node.sh +++ b/labs/scripts/osbash/init_xxx_node.sh @@ -4,7 +4,7 @@ set -o errexit -o nounset # This scripts configures hostname and networking for all nodes. The filename # determines the node name. -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/osbash/wait_debug.sh b/labs/scripts/osbash/wait_debug.sh index d426b688..a58152b1 100755 --- a/labs/scripts/osbash/wait_debug.sh +++ b/labs/scripts/osbash/wait_debug.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/setup_lbaas_controller.sh b/labs/scripts/setup_lbaas_controller.sh index d5eb61bd..c0629c8a 100755 --- a/labs/scripts/setup_lbaas_controller.sh +++ b/labs/scripts/setup_lbaas_controller.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/shutdown.sh b/labs/scripts/shutdown.sh index ea959a2e..b5782777 100755 --- a/labs/scripts/shutdown.sh +++ b/labs/scripts/shutdown.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/shutdown_controller.sh b/labs/scripts/shutdown_controller.sh index 45670ba3..6aa8a083 100755 --- a/labs/scripts/shutdown_controller.sh +++ b/labs/scripts/shutdown_controller.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/apt_init.sh b/labs/scripts/ubuntu/apt_init.sh index 76dc2c8e..96605951 100755 --- a/labs/scripts/ubuntu/apt_init.sh +++ b/labs/scripts/ubuntu/apt_init.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/openstack" # Pick up VM_PROXY diff --git a/labs/scripts/ubuntu/apt_install_mysql.sh b/labs/scripts/ubuntu/apt_install_mysql.sh index 2b8ecea4..75ee9ddc 100755 --- a/labs/scripts/ubuntu/apt_install_mysql.sh +++ b/labs/scripts/ubuntu/apt_install_mysql.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/apt_pre-download.sh b/labs/scripts/ubuntu/apt_pre-download.sh index 9d6361b8..52b131c8 100755 --- a/labs/scripts/ubuntu/apt_pre-download.sh +++ b/labs/scripts/ubuntu/apt_pre-download.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/openstack" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/apt_upgrade.sh b/labs/scripts/ubuntu/apt_upgrade.sh index 917d3fe8..eb20ef2f 100755 --- a/labs/scripts/ubuntu/apt_upgrade.sh +++ b/labs/scripts/ubuntu/apt_upgrade.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/openstack" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/install_rabbitmq.sh b/labs/scripts/ubuntu/install_rabbitmq.sh index c38f567f..1be38aa8 100755 --- a/labs/scripts/ubuntu/install_rabbitmq.sh +++ b/labs/scripts/ubuntu/install_rabbitmq.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/setup_cinder_controller.sh b/labs/scripts/ubuntu/setup_cinder_controller.sh index 7b4e7041..a8ca3ebc 100755 --- a/labs/scripts/ubuntu/setup_cinder_controller.sh +++ b/labs/scripts/ubuntu/setup_cinder_controller.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/setup_cinder_volumes.sh b/labs/scripts/ubuntu/setup_cinder_volumes.sh index a63105b6..934ac6fb 100755 --- a/labs/scripts/ubuntu/setup_cinder_volumes.sh +++ b/labs/scripts/ubuntu/setup_cinder_volumes.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$CONFIG_DIR/openstack" diff --git a/labs/scripts/ubuntu/setup_glance.sh b/labs/scripts/ubuntu/setup_glance.sh index 381e48e4..17fadde9 100755 --- a/labs/scripts/ubuntu/setup_glance.sh +++ b/labs/scripts/ubuntu/setup_glance.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/setup_horizon.sh b/labs/scripts/ubuntu/setup_horizon.sh index 3a6a20e1..2ba1cfe8 100755 --- a/labs/scripts/ubuntu/setup_horizon.sh +++ b/labs/scripts/ubuntu/setup_horizon.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$LIB_DIR/functions.guest" exec_logfile diff --git a/labs/scripts/ubuntu/setup_keystone.sh b/labs/scripts/ubuntu/setup_keystone.sh index c6c3a3a1..e71cf74c 100755 --- a/labs/scripts/ubuntu/setup_keystone.sh +++ b/labs/scripts/ubuntu/setup_keystone.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" # Get REGION diff --git a/labs/scripts/ubuntu/setup_lbaas_network.sh b/labs/scripts/ubuntu/setup_lbaas_network.sh index 5d05a883..6615a4e0 100755 --- a/labs/scripts/ubuntu/setup_lbaas_network.sh +++ b/labs/scripts/ubuntu/setup_lbaas_network.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/setup_neutron_compute.sh b/labs/scripts/ubuntu/setup_neutron_compute.sh index 403d4339..31d5b60f 100755 --- a/labs/scripts/ubuntu/setup_neutron_compute.sh +++ b/labs/scripts/ubuntu/setup_neutron_compute.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/setup_neutron_controller.sh b/labs/scripts/ubuntu/setup_neutron_controller.sh index 39188301..a01664f7 100755 --- a/labs/scripts/ubuntu/setup_neutron_controller.sh +++ b/labs/scripts/ubuntu/setup_neutron_controller.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/setup_neutron_network.sh b/labs/scripts/ubuntu/setup_neutron_network.sh index 55a4722d..32f91e27 100755 --- a/labs/scripts/ubuntu/setup_neutron_network.sh +++ b/labs/scripts/ubuntu/setup_neutron_network.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/setup_nova_compute.sh b/labs/scripts/ubuntu/setup_nova_compute.sh index 6892dc14..99c60197 100755 --- a/labs/scripts/ubuntu/setup_nova_compute.sh +++ b/labs/scripts/ubuntu/setup_nova_compute.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/ubuntu/setup_nova_controller.sh b/labs/scripts/ubuntu/setup_nova_controller.sh index c6113eae..cc12c787 100755 --- a/labs/scripts/ubuntu/setup_nova_controller.sh +++ b/labs/scripts/ubuntu/setup_nova_controller.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/yum_init.sh b/labs/scripts/yum_init.sh index d16860cc..238e10b9 100755 --- a/labs/scripts/yum_init.sh +++ b/labs/scripts/yum_init.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/openstack" # Pick up VM_PROXY diff --git a/labs/scripts/yum_update.sh b/labs/scripts/yum_update.sh index 5825459d..d32128e2 100755 --- a/labs/scripts/yum_update.sh +++ b/labs/scripts/yum_update.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/openstack" source "$LIB_DIR/functions.guest" diff --git a/labs/scripts/zero_empty.sh b/labs/scripts/zero_empty.sh index dceab9e1..d531a3c1 100755 --- a/labs/scripts/zero_empty.sh +++ b/labs/scripts/zero_empty.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o errexit -o nounset -TOP_DIR=$(cd $(dirname "$0")/.. && pwd) +TOP_DIR=$(cd "$(dirname "$0")/.." && pwd) source "$TOP_DIR/config/paths" source "$LIB_DIR/functions.guest"