diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:45 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:45 +0100 |
commit | c65ca498685d09863efde43c73d955b729340fa5 (patch) | |
tree | 70e91c97aabce39e320c94b521f5ccba15cb5551 | |
parent | af05728207583ae1f5cf88272158376c9c54eee1 (diff) | |
parent | 06fa766313fd122fc9f5ea7d26af9edd37daed78 (diff) | |
download | barebox-c65ca498685d09863efde43c73d955b729340fa5.tar.gz barebox-c65ca498685d09863efde43c73d955b729340fa5.tar.xz |
Merge branch 'for-next/shebang'
-rwxr-xr-x | Documentation/gen_commands.py | 2 | ||||
-rw-r--r-- | Documentation/user/usb.rst | 2 | ||||
-rwxr-xr-x | MAKEALL | 2 | ||||
-rwxr-xr-x | dts/scripts/cronjob | 2 | ||||
-rwxr-xr-x | dts/scripts/index-filter.sh | 2 | ||||
-rwxr-xr-x | dts/scripts/merge-new-release.sh | 2 | ||||
-rwxr-xr-x | scripts/canon-a1100-image | 4 | ||||
-rwxr-xr-x | scripts/check_size | 2 | ||||
-rwxr-xr-x | scripts/dfuboot.sh | 2 | ||||
-rwxr-xr-x | scripts/extract_symbol_offset | 2 | ||||
-rwxr-xr-x | scripts/gen-dtb-s | 2 | ||||
-rwxr-xr-x | scripts/genenv | 2 | ||||
-rwxr-xr-x | scripts/socfpga_get_sequencer | 2 | ||||
-rwxr-xr-x | scripts/socfpga_import_preloader | 2 | ||||
-rwxr-xr-x | scripts/socfpga_xml_to_config.sh | 2 |
15 files changed, 17 insertions, 15 deletions
diff --git a/Documentation/gen_commands.py b/Documentation/gen_commands.py index 203a39bb11..a55b1acd82 100755 --- a/Documentation/gen_commands.py +++ b/Documentation/gen_commands.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python from __future__ import print_function diff --git a/Documentation/user/usb.rst b/Documentation/user/usb.rst index 029e463540..4c1b2925f2 100644 --- a/Documentation/user/usb.rst +++ b/Documentation/user/usb.rst @@ -172,7 +172,7 @@ and initrd: .. code-block:: sh - #!/bin/bash + #!/usr/bin/env bash set -e set -v @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Print statistics when we exit trap exit 1 2 3 15 diff --git a/dts/scripts/cronjob b/dts/scripts/cronjob index ccdbc0607e..b7511e4253 100755 --- a/dts/scripts/cronjob +++ b/dts/scripts/cronjob @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/dts/scripts/index-filter.sh b/dts/scripts/index-filter.sh index 9610855020..c301fcea1c 100755 --- a/dts/scripts/index-filter.sh +++ b/dts/scripts/index-filter.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e set -o pipefail diff --git a/dts/scripts/merge-new-release.sh b/dts/scripts/merge-new-release.sh index a2763c69bb..554b97b8eb 100755 --- a/dts/scripts/merge-new-release.sh +++ b/dts/scripts/merge-new-release.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash case $1 in v*-dts) ;; diff --git a/scripts/canon-a1100-image b/scripts/canon-a1100-image index 6c08d7493a..17fd47373e 100755 --- a/scripts/canon-a1100-image +++ b/scripts/canon-a1100-image @@ -1,4 +1,6 @@ -#!/bin/bash -e +#!/usr/bin/env bash + +set -e IFILE=$1 OFILE=$2 diff --git a/scripts/check_size b/scripts/check_size index 8530435d3a..76608eccce 100755 --- a/scripts/check_size +++ b/scripts/check_size @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash symbol="$1" file="$2" diff --git a/scripts/dfuboot.sh b/scripts/dfuboot.sh index 524113b613..9847579ced 100755 --- a/scripts/dfuboot.sh +++ b/scripts/dfuboot.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash DEVICETREE= KERNEL= diff --git a/scripts/extract_symbol_offset b/scripts/extract_symbol_offset index 78b866830e..d0ea22434a 100755 --- a/scripts/extract_symbol_offset +++ b/scripts/extract_symbol_offset @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash symbol="$1" file="$2" diff --git a/scripts/gen-dtb-s b/scripts/gen-dtb-s index b2dd253c27..0649247f93 100755 --- a/scripts/gen-dtb-s +++ b/scripts/gen-dtb-s @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash name=$1 dtb=$2 diff --git a/scripts/genenv b/scripts/genenv index 5ebe699632..454f2327b2 100755 --- a/scripts/genenv +++ b/scripts/genenv @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Generate the default environment file from a list of directories # usage: genenv <basedir> <objdir> <target> <dir>... diff --git a/scripts/socfpga_get_sequencer b/scripts/socfpga_get_sequencer index 36f67498bc..5405bfa6ba 100755 --- a/scripts/socfpga_get_sequencer +++ b/scripts/socfpga_get_sequencer @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ "$#" -lt "2" ] then diff --git a/scripts/socfpga_import_preloader b/scripts/socfpga_import_preloader index 6c748fadb8..23e3c380db 100755 --- a/scripts/socfpga_import_preloader +++ b/scripts/socfpga_import_preloader @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ "$#" -lt "2" ] then diff --git a/scripts/socfpga_xml_to_config.sh b/scripts/socfpga_xml_to_config.sh index 7e22ebb9e8..3bb0dd283b 100755 --- a/scripts/socfpga_xml_to_config.sh +++ b/scripts/socfpga_xml_to_config.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## TODO: ## - read in mpuclk and nocclk, must be calculated by hand at the moment |