From 884b63029d595e31d0e32c64db4f8394a76526b1 Mon Sep 17 00:00:00 2001 From: "carey.xu" Date: Tue, 29 Dec 2015 16:40:02 +0800 Subject: add Shebang for bash scripts * Our bash scripts use some bash sepcific syntax, so them can not be started by other shell like zsh. Add shebang for them, so zsh can simplely execute './deploy.sh' Change-Id: Ic6e6afaa83c6de131e6ac4eda1601d11c5b22656 Signed-off-by: carey.xu --- deploy.sh | 1 + deploy/compass_vm.sh | 1 + deploy/deploy_host.sh | 1 + deploy/deploy_parameter.sh | 1 + deploy/host_baremetal.sh | 1 + deploy/host_virtual.sh | 1 + deploy/launch.sh | 1 + deploy/network.sh | 2 +- deploy/prepare.sh | 2 +- deploy_compass.sh | 1 + deploy_host.sh | 1 + redeploy_host.sh | 1 + 12 files changed, 12 insertions(+), 2 deletions(-) mode change 100644 => 100755 deploy/compass_vm.sh mode change 100644 => 100755 deploy/deploy_host.sh mode change 100644 => 100755 deploy/host_baremetal.sh mode change 100644 => 100755 deploy/host_virtual.sh diff --git a/deploy.sh b/deploy.sh index 653eec85..5b315c5c 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,3 +1,4 @@ +#!/bin/bash #set -x COMPASS_DIR=`cd ${BASH_SOURCE[0]%/*}/;pwd` export COMPASS_DIR diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh old mode 100644 new mode 100755 index 5b94b603..196df4a3 --- a/deploy/compass_vm.sh +++ b/deploy/compass_vm.sh @@ -1,3 +1,4 @@ +#!/bin/bash compass_vm_dir=$WORK_DIR/vm/compass rsa_file=$compass_vm_dir/boot.rsa ssh_args="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i $rsa_file" diff --git a/deploy/deploy_host.sh b/deploy/deploy_host.sh old mode 100644 new mode 100755 index be392d71..b87a74d3 --- a/deploy/deploy_host.sh +++ b/deploy/deploy_host.sh @@ -1,3 +1,4 @@ +#!/bin/bash function deploy_host(){ ssh $ssh_args root@${MGMT_IP} mkdir -p /opt/compass/bin/ansible_callbacks diff --git a/deploy/deploy_parameter.sh b/deploy/deploy_parameter.sh index 8b2e7695..dfecbe33 100755 --- a/deploy/deploy_parameter.sh +++ b/deploy/deploy_parameter.sh @@ -1,3 +1,4 @@ +#!/bin/bash set -x function get_option_name_list() { diff --git a/deploy/host_baremetal.sh b/deploy/host_baremetal.sh old mode 100644 new mode 100755 index 0210cee8..2281ffbf --- a/deploy/host_baremetal.sh +++ b/deploy/host_baremetal.sh @@ -1,3 +1,4 @@ +#!/bin/bash function reboot_hosts() { if [ -z $POWER_MANAGE ]; then return diff --git a/deploy/host_virtual.sh b/deploy/host_virtual.sh old mode 100644 new mode 100755 index c7e5f84e..8e93b9b3 --- a/deploy/host_virtual.sh +++ b/deploy/host_virtual.sh @@ -1,3 +1,4 @@ +#!/bin/bash host_vm_dir=$WORK_DIR/vm function tear_down_machines() { old_ifs=$IFS diff --git a/deploy/launch.sh b/deploy/launch.sh index 7160612f..b9e47693 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -1,3 +1,4 @@ +#!/bin/bash #set -x WORK_DIR=$COMPASS_DIR/work/deploy diff --git a/deploy/network.sh b/deploy/network.sh index c6d0df5d..9f1a7b90 100755 --- a/deploy/network.sh +++ b/deploy/network.sh @@ -1,4 +1,4 @@ - +#!/bin/bash function clear_forward_rejct_rules() { while sudo iptables -nL FORWARD --line-number|grep -E 'REJECT +all +-- +0.0.0.0/0 +0.0.0.0/0 +reject-with icmp-port-unreachable'|head -1|awk '{print $1}'|xargs sudo iptables -D FORWARD; do :; done diff --git a/deploy/prepare.sh b/deploy/prepare.sh index f1aacd98..ee27db1b 100755 --- a/deploy/prepare.sh +++ b/deploy/prepare.sh @@ -1,4 +1,4 @@ - +#!/bin/bash function print_logo() { if ! apt --installed list 2>/dev/null | grep "figlet" diff --git a/deploy_compass.sh b/deploy_compass.sh index a92ecea2..7d20d03a 100755 --- a/deploy_compass.sh +++ b/deploy_compass.sh @@ -1,3 +1,4 @@ +#!/bin/bash export DEPLOY_COMPASS=${DEPLOY_COMPASS-"true"} ./deploy.sh $* diff --git a/deploy_host.sh b/deploy_host.sh index 1272aee0..f5b6e786 100755 --- a/deploy_host.sh +++ b/deploy_host.sh @@ -1,3 +1,4 @@ +#!/bin/bash export DEPLOY_HOST=${DEPLOY_HOST-"true"} ./deploy.sh $* diff --git a/redeploy_host.sh b/redeploy_host.sh index 9ae02fc7..8a86ff14 100755 --- a/redeploy_host.sh +++ b/redeploy_host.sh @@ -1,3 +1,4 @@ +#!/bin/bash export REDEPLOY_HOST=${REDEPLOY_HOST-"true"} ./deploy.sh $* -- cgit 1.2.3-korg