From 0fff3e6d7f26897e048dc19ddae21b1fab41554d Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Tue, 27 Apr 2021 17:39:50 +0000 Subject: [PATCH] sh: Make use of bashisms in bash scripts Both [[ ]] and (( )) bashisms are better than the alternative in POSIX sh, since they are builtin and don't suffer from quoting or number-of-args issues. Signed-off-by: Manuel Mendez --- deploy/vagrant/scripts/tinkerbell.sh | 2 +- generate-env.sh | 4 +-- setup.sh | 38 ++++++++++++++-------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/deploy/vagrant/scripts/tinkerbell.sh b/deploy/vagrant/scripts/tinkerbell.sh index d2d7a6d..66b005a 100644 --- a/deploy/vagrant/scripts/tinkerbell.sh +++ b/deploy/vagrant/scripts/tinkerbell.sh @@ -34,7 +34,7 @@ setup_nat() ( main() ( export DEBIAN_FRONTEND=noninteractive - if [ ! -f ./.env ]; then + if ! [[ -f ./.env ]]; then ./generate-env.sh eth1 >.env fi diff --git a/generate-env.sh b/generate-env.sh index e6fb304..84f6855 100755 --- a/generate-env.sh +++ b/generate-env.sh @@ -14,7 +14,7 @@ ERR="${RED:-}ERROR:${RESET:-}" source ./current_versions.sh err() ( - if [ -z "${1:-}" ]; then + if [[ -z ${1:-} ]]; then cat >&2 else echo "$ERR " "$@" >&2 @@ -94,7 +94,7 @@ EOF ) main() ( - if [ -z "${1:-}" ]; then + if [[ -z ${1:-} ]]; then err "Usage: $0 network-interface-name > .env" exit 1 fi diff --git a/setup.sh b/setup.sh index 2164490..bedf3ca 100755 --- a/setup.sh +++ b/setup.sh @@ -38,7 +38,7 @@ NEXT="${GREEN:-}NEXT:${RESET:-}" get_distribution() ( local lsb_dist="" # Every system that we officially support has /etc/os-release - if [ -r /etc/os-release ]; then + if [[ -r /etc/os-release ]]; then # shellcheck disable=SC1091 lsb_dist="$(. /etc/os-release && echo "$ID")" fi @@ -50,7 +50,7 @@ get_distribution() ( get_distro_version() ( local lsb_version="0" # Every system that we officially support has /etc/os-release - if [ -r /etc/os-release ]; then + if [[ -r /etc/os-release ]]; then # shellcheck disable=SC1091 lsb_version="$(. /etc/os-release && echo "$VERSION_ID")" fi @@ -112,10 +112,10 @@ setup_networking() ( fi NAT_INTERFACE="" - if [ -r .nat_interface ]; then + if [[ -r .nat_interface ]]; then NAT_INTERFACE=$(cat .nat_interface) fi - if [ -n "$NAT_INTERFACE" ] && ip addr show "$NAT_INTERFACE" &>/dev/null; then + if [[ -n $NAT_INTERFACE ]] && ip addr show "$NAT_INTERFACE" &>/dev/null; then # TODO(nshalman) the terraform code would just run these commands as-is once # but it would be nice to make these more persistent based on OS iptables -A FORWARD -i "$TINKERBELL_NETWORK_INTERFACE" -o "$NAT_INTERFACE" -j ACCEPT @@ -135,10 +135,10 @@ setup_networking_manually() ( setup_network_forwarding() ( # enable IP forwarding for docker - if [ "$(sysctl -n net.ipv4.ip_forward)" != "1" ]; then - if [ -d /etc/sysctl.d ]; then + if (($(sysctl -n net.ipv4.ip_forward) != 1)); then + if [[ -d /etc/sysctl.d ]]; then echo "net.ipv4.ip_forward=1" >/etc/sysctl.d/99-tinkerbell.conf - elif [ -f /etc/sysctl.conf ]; then + elif [[ -f /etc/sysctl.conf ]]; then echo "net.ipv4.ip_forward=1" >>/etc/sysctl.conf fi @@ -171,7 +171,7 @@ setup_networking_netplan() ( ) setup_networking_ubuntu_legacy() ( - if [ ! -f /etc/network/interfaces ]; then + if ! [[ -f /etc/network/interfaces ]]; then echo "$ERR file /etc/network/interfaces not found" exit 1 fi @@ -224,7 +224,7 @@ EOF local cfgfile="/etc/sysconfig/network-scripts/ifcfg-$TINKERBELL_NETWORK_INTERFACE" - if [ -f "$cfgfile" ]; then + if [[ -f $cfgfile ]]; then echo "$ERR network config already exists: $cfgfile" echo "$BLANK Please update it to match this configuration:" echo "$content" @@ -245,12 +245,12 @@ setup_osie() ( local osie_current=$STATEDIR/webroot/misc/osie/current local tink_workflow=$STATEDIR/webroot/workflow/ - if [ ! -d "$osie_current" ] || [ ! -d "$tink_workflow" ]; then + if [[ ! -d $osie_current ]] || [[ ! -d $tink_workflow ]]; then mkdir -p "$osie_current" mkdir -p "$tink_workflow" pushd "$SCRATCH" - if [ -z "${TB_OSIE_TAR:-}" ]; then + if [[ -z ${TB_OSIE_TAR:-} ]]; then curl "${OSIE_DOWNLOAD_LINK}" -o ./osie.tar.gz tar -zxf osie.tar.gz else @@ -305,7 +305,7 @@ check_container_status() ( --filter "event=health_status" \ --format '{{.Status}}') - if [ "$status" != "health_status: healthy" ]; then + if [[ $status != "health_status: healthy" ]]; then echo "$ERR $container_name is not healthy. status: $status" exit 1 fi @@ -314,7 +314,7 @@ check_container_status() ( generate_certificates() ( mkdir -p "$STATEDIR/certs" - if [ ! -f "$STATEDIR/certs/ca.json" ]; then + if ! [[ -f "$STATEDIR/certs/ca.json" ]]; then jq \ '. | .names[0].L = $facility @@ -325,7 +325,7 @@ generate_certificates() ( >"$STATEDIR/certs/ca.json" fi - if [ ! -f "$STATEDIR/certs/server-csr.json" ]; then + if ! [[ -f "$STATEDIR/certs/server-csr.json" ]]; then jq \ '. | .hosts += [ $ip, "tinkerbell.\($facility).packet.net" ] @@ -353,7 +353,7 @@ generate_certificates() ( # update host to trust registry certificate if ! cmp --quiet "$STATEDIR/certs/ca.pem" "$certs_dir/tinkerbell.crt"; then - if [ ! -d "$certs_dir/tinkerbell.crt" ]; then + if ! [[ -d "$certs_dir/" ]]; then # The user will be told to create the directory # in the next block, if copying the certs there # fails. @@ -363,7 +363,7 @@ generate_certificates() ( echo "$ERR please copy $STATEDIR/certs/ca.pem to $certs_dir/tinkerbell.crt" echo "$BLANK and run $0 again:" - if [ ! -d "$certs_dir" ]; then + if ! [[ -d $certs_dir ]]; then echo "sudo mkdir -p '$certs_dir'" fi echo "sudo cp '$STATEDIR/certs/ca.pem' '$certs_dir/tinkerbell.crt'" @@ -406,7 +406,7 @@ bootstrap_docker_registry() ( setup_docker_registry() ( local registry_images="$STATEDIR/registry" - if [ ! -d "$registry_images" ]; then + if ! [[ -d $registry_images ]]; then mkdir -p "$registry_images" fi start_registry @@ -469,7 +469,7 @@ check_prerequisites() ( ;; esac - if [ $failed -eq 1 ]; then + if ((failed == 1)); then echo "$ERR Prerequisites not met. Please install the missing commands and re-run $0." exit 1 fi @@ -489,7 +489,7 @@ do_setup() ( echo "$INFO starting tinkerbell stack setup" check_prerequisites "$lsb_dist" "$lsb_version" - if [ ! -f "$ENV_FILE" ]; then + if ! [[ -f $ENV_FILE ]]; then echo "$ERR Run './generate-env.sh network-interface > \"$ENV_FILE\"' before continuing." exit 1 fi