From 2f2900213cc8157590f11dcc7988c1a3bb7dc887 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 20 Apr 2015 19:31:17 -0400 Subject: Be careful about shebangs, which shells are used, and what gets executed Use - #!/hint/bash for bash that gets sourced (non-executable) - #!/hint/sh for sh(1) that gets sourced (non-executable) - #!/bin/sh for sh(1) that gets executed - #!/usr/bin/env bash for bash that gets executed To this end, also - Clean up a couple of related comments - Fix a couple of bash-isms that I noticed in sh(1) files - Fix permissions on a couple of files that get sourced --- .config/wmii-hg/config.sh | 2 +- .config/wmii-hg/help-events | 2 +- .config/wmii-hg/help-keys | 2 +- .config/wmii-hg/include.sh | 2 +- .config/wmii-hg/quit | 2 +- .config/wmii-hg/rbar | 2 +- .config/wmii-hg/rbar.sh | 2 +- .config/wmii-hg/rbar_acpi | 2 +- .config/wmii-hg/rbar_clock | 2 +- .config/wmii-hg/rbar_wifi | 2 +- .config/wmii-hg/theme-solarized | 1 + .config/wmii-hg/theme-solarized-dark | 2 +- .config/wmii-hg/theme-tango | 1 + .config/wmii-hg/theme-tango-dark | 2 +- .config/wmii-hg/util.sh | 2 +- .config/wmii-hg/wmiirc | 2 +- 16 files changed, 16 insertions(+), 14 deletions(-) (limited to '.config/wmii-hg') diff --git a/.config/wmii-hg/config.sh b/.config/wmii-hg/config.sh index ac0a349..6846920 100644 --- a/.config/wmii-hg/config.sh +++ b/.config/wmii-hg/config.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/hint/bash MODKEY=Mod4 # "super" UP=p diff --git a/.config/wmii-hg/help-events b/.config/wmii-hg/help-events index 08abd18..9aeb3e9 100755 --- a/.config/wmii-hg/help-events +++ b/.config/wmii-hg/help-events @@ -1,3 +1,3 @@ -#!/bin/bash +#!/usr/bin/env bash . include.sh scansection Event | xmessage -file - diff --git a/.config/wmii-hg/help-keys b/.config/wmii-hg/help-keys index 6f4bd1c..f7a975e 100755 --- a/.config/wmii-hg/help-keys +++ b/.config/wmii-hg/help-keys @@ -1,3 +1,3 @@ -#!/bin/bash +#!/usr/bin/env bash . include.sh scansection Key | xmessage -file - diff --git a/.config/wmii-hg/include.sh b/.config/wmii-hg/include.sh index f9e3078..4e86276 100644 --- a/.config/wmii-hg/include.sh +++ b/.config/wmii-hg/include.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/hint/bash if [[ -z "$WMII_NAMESPACE" ]]; then export WMII_NAMESPACE="$(wmiir namespace)" diff --git a/.config/wmii-hg/quit b/.config/wmii-hg/quit index 341468e..b34a913 100755 --- a/.config/wmii-hg/quit +++ b/.config/wmii-hg/quit @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if type systemctl &>/dev/null; then systemctl --user stop "wmii@$DISPLAY.service" else diff --git a/.config/wmii-hg/rbar b/.config/wmii-hg/rbar index b95f9c4..0709ed3 100755 --- a/.config/wmii-hg/rbar +++ b/.config/wmii-hg/rbar @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash id=$1 name=${id#[0-9][0-9]_} diff --git a/.config/wmii-hg/rbar.sh b/.config/wmii-hg/rbar.sh index 8bff558..0c9efa6 100644 --- a/.config/wmii-hg/rbar.sh +++ b/.config/wmii-hg/rbar.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/hint/bash setup_trap() { trap "rm -f -- \"\${XDG_RUNTIME_DIR}\"/n/wmii*/rbar/${1}" EXIT } diff --git a/.config/wmii-hg/rbar_acpi b/.config/wmii-hg/rbar_acpi index bdcdf0f..6348873 100755 --- a/.config/wmii-hg/rbar_acpi +++ b/.config/wmii-hg/rbar_acpi @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash update() { id=$1 diff --git a/.config/wmii-hg/rbar_clock b/.config/wmii-hg/rbar_clock index a09f016..e84d5c3 100755 --- a/.config/wmii-hg/rbar_clock +++ b/.config/wmii-hg/rbar_clock @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash update() { id=$1 diff --git a/.config/wmii-hg/rbar_wifi b/.config/wmii-hg/rbar_wifi index f83d921..dad4e61 100755 --- a/.config/wmii-hg/rbar_wifi +++ b/.config/wmii-hg/rbar_wifi @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash iwinfo() { local interface=$1 diff --git a/.config/wmii-hg/theme-solarized b/.config/wmii-hg/theme-solarized index 5dc830d..8c40e4d 100644 --- a/.config/wmii-hg/theme-solarized +++ b/.config/wmii-hg/theme-solarized @@ -1,3 +1,4 @@ +#!/hint/bash SOL_BASE03='#002b36' SOL_BASE02='#073642' SOL_BASE01='#586e75' diff --git a/.config/wmii-hg/theme-solarized-dark b/.config/wmii-hg/theme-solarized-dark index fde361b..fc74b6c 100644 --- a/.config/wmii-hg/theme-solarized-dark +++ b/.config/wmii-hg/theme-solarized-dark @@ -1,4 +1,4 @@ -#!/bin/sh +#!/hint/bash # Solarized-dark . theme-solarized diff --git a/.config/wmii-hg/theme-tango b/.config/wmii-hg/theme-tango index f4c20a2..6ba744f 100644 --- a/.config/wmii-hg/theme-tango +++ b/.config/wmii-hg/theme-tango @@ -1,3 +1,4 @@ +#!/hint/bash TANGO_butter=("#fce94f" "#edd400" "#c4a000") TANGO_orange=("#fcaf3e" "#f57900" "#ce5c00") TANGO_choc=( "#e9b96e" "#c17d11" "#8f5902") diff --git a/.config/wmii-hg/theme-tango-dark b/.config/wmii-hg/theme-tango-dark index 04a9fa6..efea1e9 100644 --- a/.config/wmii-hg/theme-tango-dark +++ b/.config/wmii-hg/theme-tango-dark @@ -1,4 +1,4 @@ -#!/bin/bash +#!/hint/bash # Tango-tark . theme-tango diff --git a/.config/wmii-hg/util.sh b/.config/wmii-hg/util.sh index b28a3b6..55344b2 100644 --- a/.config/wmii-hg/util.sh +++ b/.config/wmii-hg/util.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/hint/bash ################################################################################ # Added shell features # diff --git a/.config/wmii-hg/wmiirc b/.config/wmii-hg/wmiirc index 6fd348f..260aaa1 100755 --- a/.config/wmii-hg/wmiirc +++ b/.config/wmii-hg/wmiirc @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash unset WMII_NAMESPACE unset WMII_DIR -- cgit v1.2.3