diff options
author | QMK Bot <hello@qmk.fm> | 2021-07-06 14:56:47 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-07-06 14:56:47 +0000 |
commit | 150f4ef5dcb3546566bcbbd7b744975bdebd23b6 (patch) | |
tree | 8f9e03bd6880398f7cfabb511c091b580df8d4a6 /util | |
parent | fc4f03086f7fdd8eb35c5b88de9d3757f402eaf5 (diff) | |
parent | acf7de7a52c16dd994305ce289e60e4894ff04d0 (diff) | |
download | qmk_firmware-150f4ef5dcb3546566bcbbd7b744975bdebd23b6.tar.gz qmk_firmware-150f4ef5dcb3546566bcbbd7b744975bdebd23b6.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'util')
-rwxr-xr-x | util/chibios_conf_updater.sh | 2 | ||||
-rwxr-xr-x | util/generate_internal_docs.sh | 2 | ||||
-rwxr-xr-x | util/install/arch.sh | 2 | ||||
-rwxr-xr-x | util/install/debian.sh | 2 | ||||
-rwxr-xr-x | util/install/fedora.sh | 2 | ||||
-rwxr-xr-x | util/install/freebsd.sh | 2 | ||||
-rwxr-xr-x | util/install/gentoo.sh | 2 | ||||
-rwxr-xr-x | util/install/linux_shared.sh | 2 | ||||
-rwxr-xr-x | util/install/macos.sh | 2 | ||||
-rwxr-xr-x | util/install/msys2.sh | 2 | ||||
-rwxr-xr-x | util/install/slackware.sh | 2 | ||||
-rwxr-xr-x | util/install/solus.sh | 2 | ||||
-rwxr-xr-x | util/install/void.sh | 2 | ||||
-rwxr-xr-x | util/new_keyboard.sh | 2 | ||||
-rwxr-xr-x | util/qmk_install.sh | 2 | ||||
-rwxr-xr-x | util/rules_cleaner.sh | 2 | ||||
-rwxr-xr-x | util/travis_build.sh | 2 | ||||
-rwxr-xr-x | util/travis_compiled_push.sh | 2 | ||||
-rw-r--r-- | util/travis_test.sh | 2 |
19 files changed, 19 insertions, 19 deletions
diff --git a/util/chibios_conf_updater.sh b/util/chibios_conf_updater.sh index 70bd80da1e..5ba8aa677b 100755 --- a/util/chibios_conf_updater.sh +++ b/util/chibios_conf_updater.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eEuo pipefail umask 022 diff --git a/util/generate_internal_docs.sh b/util/generate_internal_docs.sh index bfee797d3a..b107a37ad6 100755 --- a/util/generate_internal_docs.sh +++ b/util/generate_internal_docs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -x diff --git a/util/install/arch.sh b/util/install/arch.sh index eac4ad64ef..bef98ac37f 100755 --- a/util/install/arch.sh +++ b/util/install/arch.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash _qmk_install() { echo "Installing dependencies" diff --git a/util/install/debian.sh b/util/install/debian.sh index 9e12996976..57588e371a 100755 --- a/util/install/debian.sh +++ b/util/install/debian.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true diff --git a/util/install/fedora.sh b/util/install/fedora.sh index 3f9695356c..e123447d3f 100755 --- a/util/install/fedora.sh +++ b/util/install/fedora.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash _qmk_install() { echo "Installing dependencies" diff --git a/util/install/freebsd.sh b/util/install/freebsd.sh index d9399a5de9..595911969d 100755 --- a/util/install/freebsd.sh +++ b/util/install/freebsd.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash _qmk_install_prepare() { sudo pkg update $SKIP_PROMPT diff --git a/util/install/gentoo.sh b/util/install/gentoo.sh index 604d07bf84..b031fc7629 100755 --- a/util/install/gentoo.sh +++ b/util/install/gentoo.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash _qmk_install_prepare() { echo "This script will make a USE change in order to ensure that that QMK works on your system." diff --git a/util/install/linux_shared.sh b/util/install/linux_shared.sh index cb81e8611f..e060f425f5 100755 --- a/util/install/linux_shared.sh +++ b/util/install/linux_shared.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # For those distros that do not package bootloadHID _qmk_install_bootloadhid() { diff --git a/util/install/macos.sh b/util/install/macos.sh index 4b87217ba0..3ce8ddbfd3 100755 --- a/util/install/macos.sh +++ b/util/install/macos.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash _qmk_install_prepare() { echo "Checking Homebrew installation" diff --git a/util/install/msys2.sh b/util/install/msys2.sh index b027ff53d2..203f8eff0c 100755 --- a/util/install/msys2.sh +++ b/util/install/msys2.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash _qmk_install_prepare() { pacman -Syu $MSYS2_CONFIRM diff --git a/util/install/slackware.sh b/util/install/slackware.sh index d73303159d..df4d073e7b 100755 --- a/util/install/slackware.sh +++ b/util/install/slackware.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash _qmk_install_prepare() { echo "Before you continue, please ensure that your user is added to sudoers and that sboinstall is configured." diff --git a/util/install/solus.sh b/util/install/solus.sh index 5633f7039c..fad0605cf6 100755 --- a/util/install/solus.sh +++ b/util/install/solus.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash _qmk_install_prepare() { sudo eopkg -y update-repo diff --git a/util/install/void.sh b/util/install/void.sh index c49c3ef63f..6aeb8e00ae 100755 --- a/util/install/void.sh +++ b/util/install/void.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash _qmk_install() { echo "Installing dependencies" diff --git a/util/new_keyboard.sh b/util/new_keyboard.sh index cf3339f9a7..d0db23bb42 100755 --- a/util/new_keyboard.sh +++ b/util/new_keyboard.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script generates a new keyboard directory under keyboards/, # and copies the template files from quantum/template/ into it. diff --git a/util/qmk_install.sh b/util/qmk_install.sh index 943069453a..06eb4f0228 100755 --- a/util/qmk_install.sh +++ b/util/qmk_install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash QMK_FIRMWARE_DIR=$(cd -P -- "$(dirname -- "$0")/.." && pwd -P) QMK_FIRMWARE_UTIL_DIR=$QMK_FIRMWARE_DIR/util diff --git a/util/rules_cleaner.sh b/util/rules_cleaner.sh index ac27c2b09b..0367ae849f 100755 --- a/util/rules_cleaner.sh +++ b/util/rules_cleaner.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This script finds all rules.mk files in keyboards/ subdirectories, # and deletes the build option filesize impacts from them. diff --git a/util/travis_build.sh b/util/travis_build.sh index e7bbe36a7b..a96cfcb575 100755 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source util/travis_utils.sh diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 6300442fdb..73a9e3bc48 100755 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source util/travis_utils.sh source util/travis_push.sh diff --git a/util/travis_test.sh b/util/travis_test.sh index be0cfce001..9156147ca6 100644 --- a/util/travis_test.sh +++ b/util/travis_test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source util/travis_utils.sh |