summaryrefslogtreecommitdiff
path: root/.config/X11
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-04-20 19:31:17 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-04-20 19:34:20 -0400
commit2f2900213cc8157590f11dcc7988c1a3bb7dc887 (patch)
tree1894dace4b02568903218cdefb4821bfbd1eda22 /.config/X11
parent8fd263648f772783767ab6eab0ee25ac8772dcab (diff)
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
Diffstat (limited to '.config/X11')
-rw-r--r--[-rwxr-xr-x].config/X11/clientrc2
-rwxr-xr-x.config/X11/login9
-rw-r--r--.config/X11/serverrc2
3 files changed, 4 insertions, 9 deletions
diff --git a/.config/X11/clientrc b/.config/X11/clientrc
index 2c965da..88ae527 100755..100644
--- 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