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/X11/clientrc | 2 +- .config/X11/login | 9 ++------- .config/X11/serverrc | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) mode change 100755 => 100644 .config/X11/clientrc (limited to '.config/X11') diff --git a/.config/X11/clientrc b/.config/X11/clientrc old mode 100755 new mode 100644 index 2c965da..88ae527 --- a/.config/X11/clientrc +++ b/.config/X11/clientrc @@ -1,4 +1,4 @@ -#!/bin/sh +#!/hint/sh # Load system xinit modules (disabled) # Remove "false &&" to enable diff --git a/.config/X11/login b/.config/X11/login index 84931df..d02088a 100755 --- a/.config/X11/login +++ b/.config/X11/login @@ -1,9 +1,4 @@ #!/bin/sh +# ~/.xsession: Executed by the XDM at login, maybe after sourcing ~/.xprofile -# -# ~/.xsession -# -# Executed by xdm/gdm/kdm at login -# - -exec bash --login -i ~/.xinitrc +exec bash --login ~/.xinitrc diff --git a/.config/X11/serverrc b/.config/X11/serverrc index 6b57eeb..e6f4c8f 100644 --- a/.config/X11/serverrc +++ b/.config/X11/serverrc @@ -1,4 +1,4 @@ -#!/bin/sh +#!/hint/sh if [ -z "$XDG_VTNR" ]; then exec /usr/bin/X -nolisten tcp "$@" else -- cgit v1.2.3-2-g168b