From d8ea06c5c5bfee17ff878cfa2aecfe11c7dec4db Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 1 Mar 2017 18:29:52 -0800 Subject: [PATCH] *: don't hardcode path to bash Bash isn't always at this location. These scripts in particular are being updated because they are called from outside of the SDK. --- core_roller_upload | 2 +- core_sign_update | 2 +- oem/azure/publish.sh | 2 +- oem/azure/replicate-image.sh | 2 +- oem/azure/set-image-metadata.sh | 2 +- oem/azure/share-image.sh | 2 +- oem/azure/unreplicate-image.sh | 2 +- oem/azure/update-gallery.sh | 2 +- offline_signing/download.sh | 2 +- offline_signing/new_key.sh | 2 +- offline_signing/print_key.sh | 2 +- offline_signing/sign.sh | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core_roller_upload b/core_roller_upload index 387236ca43..a358e708b5 100755 --- a/core_roller_upload +++ b/core_roller_upload @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright (c) 2013 The CoreOS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/core_sign_update b/core_sign_update index a658206a2e..fd461c54fb 100755 --- a/core_sign_update +++ b/core_sign_update @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright (c) 2014 CoreOS, Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff --git a/oem/azure/publish.sh b/oem/azure/publish.sh index b65ff781ef..ab9b43f41d 100755 --- a/oem/azure/publish.sh +++ b/oem/azure/publish.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script will copy the Azure image from the CoreOS build bucket into # Azure storage, create an Azure VM image, and replicate it to all regions. It diff --git a/oem/azure/replicate-image.sh b/oem/azure/replicate-image.sh index 0e7c2a851f..4e20629602 100755 --- a/oem/azure/replicate-image.sh +++ b/oem/azure/replicate-image.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script will replicate the given image into all Azure regions. It needs # to be run in an environment where the azure-xplat-cli has been installed and diff --git a/oem/azure/set-image-metadata.sh b/oem/azure/set-image-metadata.sh index de0297cf7c..3baf881ec3 100755 --- a/oem/azure/set-image-metadata.sh +++ b/oem/azure/set-image-metadata.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script will set the icon, recommended VM size, and optionally the # publication date for the specified OS image to the CoreOS logo. It needs to diff --git a/oem/azure/share-image.sh b/oem/azure/share-image.sh index 5db5a8a77b..155cc2adf0 100755 --- a/oem/azure/share-image.sh +++ b/oem/azure/share-image.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script will replicate the given image into all Azure regions. It needs # to be run in an environment where the azure-xplat-cli has been installed and diff --git a/oem/azure/unreplicate-image.sh b/oem/azure/unreplicate-image.sh index 3c96f5bf07..1a211b951d 100755 --- a/oem/azure/unreplicate-image.sh +++ b/oem/azure/unreplicate-image.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script will un-replicate the given image. It needs to be run in an # environment where the azure-xplat-cli has been installed and configured with diff --git a/oem/azure/update-gallery.sh b/oem/azure/update-gallery.sh index 230ee88f4c..e75d794a49 100755 --- a/oem/azure/update-gallery.sh +++ b/oem/azure/update-gallery.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script will update the Azure Gallery repo with the specified group and # version. diff --git a/offline_signing/download.sh b/offline_signing/download.sh index d2f305b4aa..1b6c099703 100755 --- a/offline_signing/download.sh +++ b/offline_signing/download.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex BOARD="$1" diff --git a/offline_signing/new_key.sh b/offline_signing/new_key.sh index f4a755c4c3..51ba500b42 100755 --- a/offline_signing/new_key.sh +++ b/offline_signing/new_key.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex KEY="$1" diff --git a/offline_signing/print_key.sh b/offline_signing/print_key.sh index 8a8253d0c2..40e6c5ea7f 100755 --- a/offline_signing/print_key.sh +++ b/offline_signing/print_key.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # If there is no default printer use ./print_key.sh prod-2 -d printer_name # List available printers with lpstat -a diff --git a/offline_signing/sign.sh b/offline_signing/sign.sh index baf6c8cfbb..2fe4fb3e58 100755 --- a/offline_signing/sign.sh +++ b/offline_signing/sign.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex DATA_DIR="$(readlink -f "$1")"