aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2018-12-07 13:41:06 -0600
committerWilliam Hubbs <w.d.hubbs@gmail.com>2018-12-08 12:06:26 -0600
commit5427783fdf3d183ea4e63afc507c31d88f0d2c9c (patch)
tree3da5a048164ea07caed56196f6afc35a6fe4dedc
parentd95425b08a1675efb66def056d0f92e6b2d78a77 (diff)
standardize the default shell
I do not know of a need to have the default shell be a build-time configurable setting. All *nix systems I am aware of have /bin/sh as a default posix compatible shell. If some systems running OpenRC do not make that assumption about /bin/sh, I will consider bringing this back, so feel free to open an issue.
Diffstat
-rw-r--r--etc/rc.in2
-rw-r--r--etc/rc.shutdown.in2
-rw-r--r--mk/scripts.mk2
-rw-r--r--scripts/halt.in2
-rw-r--r--scripts/poweroff.in2
-rw-r--r--scripts/rc-sstat.in2
-rw-r--r--scripts/reboot.in2
-rw-r--r--scripts/shutdown.in2
-rw-r--r--sh/binfmt.sh.in2
-rw-r--r--sh/cgroup-release-agent.sh.in2
-rw-r--r--sh/gendepends.sh.in2
-rw-r--r--sh/init-early.sh.Linux.in2
-rw-r--r--sh/init.sh.BSD.in2
-rw-r--r--sh/init.sh.GNU-kFreeBSD.in2
-rw-r--r--sh/init.sh.GNU.in2
-rw-r--r--sh/init.sh.Linux.in2
-rw-r--r--sh/migrate-to-run.sh.in2
-rw-r--r--sh/openrc-run.sh.in2
18 files changed, 18 insertions, 18 deletions
diff --git a/etc/rc.in b/etc/rc.in
index 72f8f05b..3d341512 100644
--- a/etc/rc.in
+++ b/etc/rc.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# Copyright (c) 2007-2015 The OpenRC Authors.
# See the Authors file at the top-level directory of this distribution and
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
diff --git a/etc/rc.shutdown.in b/etc/rc.shutdown.in
index de3e09b9..e38ff3d9 100644
--- a/etc/rc.shutdown.in
+++ b/etc/rc.shutdown.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# Copyright (c) 2007-2015 The OpenRC Authors.
# See the Authors file at the top-level directory of this distribution and
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
diff --git a/mk/scripts.mk b/mk/scripts.mk
index 0cbd3bfd..29babf9c 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -19,7 +19,7 @@ _PKG_SED:= $(shell ${_PKG_SED_SH})
_LCL_SED_SH= if test "${PREFIX}" = "${LOCAL_PREFIX}"; then echo "-e 's:@LOCAL_PREFIX@::g'"; else echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; fi
_LCL_SED:= $(shell ${_LCL_SED_SH})
-SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@BINDIR@:${BINDIR}:g' -e 's:@SBINDIR@:${SBINDIR}:g' ${_PKG_SED} ${_LCL_SED}
+SED_REPLACE= -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@BINDIR@:${BINDIR}:g' -e 's:@SBINDIR@:${SBINDIR}:g' ${_PKG_SED} ${_LCL_SED}
# Tweak our shell scripts
%.sh: %.sh.in
diff --git a/scripts/halt.in b/scripts/halt.in
index 257cc2a7..70e93662 100644
--- a/scripts/halt.in
+++ b/scripts/halt.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
option_arg=
poweroff_arg=
diff --git a/scripts/poweroff.in b/scripts/poweroff.in
index 5632f679..1c260d32 100644
--- a/scripts/poweroff.in
+++ b/scripts/poweroff.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
option_arg=
poweroff_arg=
diff --git a/scripts/rc-sstat.in b/scripts/rc-sstat.in
index a204dbda..bcd0ae23 100644
--- a/scripts/rc-sstat.in
+++ b/scripts/rc-sstat.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# Copyright (c) 2015 The OpenRC Authors.
# See the Authors file at the top-level directory of this distribution and
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
diff --git a/scripts/reboot.in b/scripts/reboot.in
index c805ceb2..60251d8c 100644
--- a/scripts/reboot.in
+++ b/scripts/reboot.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
option_arg=
poweroff_arg=
diff --git a/scripts/shutdown.in b/scripts/shutdown.in
index 7d68bf09..af3ea2b3 100644
--- a/scripts/shutdown.in
+++ b/scripts/shutdown.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
shutdown_arg=
while getopts :akrhPHfFnct: opt; do
diff --git a/sh/binfmt.sh.in b/sh/binfmt.sh.in
index be0ed482..ca4a8833 100644
--- a/sh/binfmt.sh.in
+++ b/sh/binfmt.sh.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# This is a reimplementation of the systemd binfmt.d code to register
# misc binary formats with the kernel.
#
diff --git a/sh/cgroup-release-agent.sh.in b/sh/cgroup-release-agent.sh.in
index 394b7ec7..179e6bcf 100644
--- a/sh/cgroup-release-agent.sh.in
+++ b/sh/cgroup-release-agent.sh.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# This is run by the kernel after the last task is removed from a
# control group in the openrc hierarchy.
diff --git a/sh/gendepends.sh.in b/sh/gendepends.sh.in
index 45147e6a..6ecec6b7 100644
--- a/sh/gendepends.sh.in
+++ b/sh/gendepends.sh.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# Shell wrapper to list our dependencies
# Copyright (c) 2007-2015 The OpenRC Authors.
diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in
index f07bc11b..b7082a02 100644
--- a/sh/init-early.sh.Linux.in
+++ b/sh/init-early.sh.Linux.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# Copyright (c) 2007-2015 The OpenRC Authors.
# See the Authors file at the top-level directory of this distribution and
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
diff --git a/sh/init.sh.BSD.in b/sh/init.sh.BSD.in
index 64282e99..eb524aaf 100644
--- a/sh/init.sh.BSD.in
+++ b/sh/init.sh.BSD.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# Copyright (c) 2007-2015 The OpenRC Authors.
# See the Authors file at the top-level directory of this distribution and
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
diff --git a/sh/init.sh.GNU-kFreeBSD.in b/sh/init.sh.GNU-kFreeBSD.in
index 5eb8064e..dd07ad4a 100644
--- a/sh/init.sh.GNU-kFreeBSD.in
+++ b/sh/init.sh.GNU-kFreeBSD.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# Copyright (c) 2007-2015 The OpenRC Authors.
# See the Authors file at the top-level directory of this distribution and
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
diff --git a/sh/init.sh.GNU.in b/sh/init.sh.GNU.in
index 08a492a1..23f67480 100644
--- a/sh/init.sh.GNU.in
+++ b/sh/init.sh.GNU.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# Copyright (c) 2007-2015 The OpenRC Authors.
# See the Authors file at the top-level directory of this distribution and
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in
index 7ee25b57..222bbd3b 100644
--- a/sh/init.sh.Linux.in
+++ b/sh/init.sh.Linux.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# Copyright (c) 1999-2007 Gentoo Foundation
# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
# Released under the 2-clause BSD license.
diff --git a/sh/migrate-to-run.sh.in b/sh/migrate-to-run.sh.in
index 2a31b6d6..7dc85e66 100644
--- a/sh/migrate-to-run.sh.in
+++ b/sh/migrate-to-run.sh.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# Copyright (c) 2012-2015 The OpenRC Authors.
# See the Authors file at the top-level directory of this distribution and
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in
index 7e9064c2..20c1b8ad 100644
--- a/sh/openrc-run.sh.in
+++ b/sh/openrc-run.sh.in
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!/bin/sh
# Shell wrapper for openrc-run
# Copyright (c) 2007-2015 The OpenRC Authors.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 18:04:54 +0000