diff options
Diffstat (limited to 'sh')
| -rw-r--r-- | sh/functions.sh.in | 6 | ||||
| -rw-r--r-- | sh/gendepends.sh.in | 4 | ||||
| -rw-r--r-- | sh/ifwatchd-carrier.sh.in | 2 | ||||
| -rw-r--r-- | sh/ifwatchd-nocarrier.sh.in | 2 | ||||
| -rw-r--r-- | sh/rc-functions.sh.in | 2 | ||||
| -rw-r--r-- | sh/runscript.sh.in | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/sh/functions.sh.in b/sh/functions.sh.in index cdd88563..23f3f627 100644 --- a/sh/functions.sh.in +++ b/sh/functions.sh.in @@ -85,13 +85,13 @@ if [ -n "$_LOCAL_PREFIX" ]; then _PATH="$_PATH:$_LOCAL_PREFIX/bin:$_LOCAL_PREFIX/sbin" fi _path="$(_sanitize_path "$PATH")" -export PATH="$_PATH${_path:+:}$_path" +PATH="$_PATH${_path:+:}$_path" ; export PATH unset _sanitize_path _PREFIX _PKG_PREFIX _LOCAL_PREFIX _PATH _path for arg; do case "$arg" in --nocolor|--nocolour|-C) - export EINFO_COLOR="NO" + EINFO_COLOR="NO" ; export EINFO_COLOR ;; esac done @@ -106,7 +106,7 @@ else for _e in ebegin eend error errorn einfo einfon ewarn ewarnn ewend \ vebegin veend veinfo vewarn vewend; do eval "$_e() { local _r; command $_e \"\$@\"; _r=\$?; \ - export EINFO_LASTCMD=$_e; return \$_r; }" + EINFO_LASTCMD=$_e; export EINFO_LASTCMD ; return \$_r; }" done unset _e fi diff --git a/sh/gendepends.sh.in b/sh/gendepends.sh.in index 8dab3c2b..f78f3d32 100644 --- a/sh/gendepends.sh.in +++ b/sh/gendepends.sh.in @@ -58,10 +58,10 @@ do continue unset one two three - export RC_SVCNAME=${RC_SERVICE##*/} + RC_SVCNAME=${RC_SERVICE##*/} ; export RC_SVCNAME # Compat - export SVCNAME=$RC_SVCNAME + SVCNAME=$RC_SVCNAME ; export SVCNAME ( # Save stdout in fd3, then remap it to stderr diff --git a/sh/ifwatchd-carrier.sh.in b/sh/ifwatchd-carrier.sh.in index 3b1dc449..5b5d8b34 100644 --- a/sh/ifwatchd-carrier.sh.in +++ b/sh/ifwatchd-carrier.sh.in @@ -1,5 +1,5 @@ #!@SHELL@ # Wrapper for ifwatchd(8) -export IN_BACKGROUND=yes +IN_BACKGROUND=yes ; export IN_BACKGROUND $RC_SERVICE --quiet start diff --git a/sh/ifwatchd-nocarrier.sh.in b/sh/ifwatchd-nocarrier.sh.in index cedc275f..bbecfe84 100644 --- a/sh/ifwatchd-nocarrier.sh.in +++ b/sh/ifwatchd-nocarrier.sh.in @@ -1,5 +1,5 @@ #!@SHELL@ # Wrapper for ifwatchd(8) -export IN_BACKGROUND=yes +IN_BACKGROUND=yes ; export IN_BACKGROUND $RC_SERVICE --quiet stop diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in index de430742..7fe12942 100644 --- a/sh/rc-functions.sh.in +++ b/sh/rc-functions.sh.in @@ -109,5 +109,5 @@ _depend() { # Add our sbin to $PATH case "$PATH" in "$RC_LIBEXECDIR"/sbin|"$RC_LIBEXECDIR"/sbin:*);; - *) export PATH="$RC_LIBEXECDIR/sbin:$PATH";; + *) PATH="$RC_LIBEXECDIR/sbin:$PATH" ; export PATH ;; esac diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in index 6ad2ded3..d53d70d6 100644 --- a/sh/runscript.sh.in +++ b/sh/runscript.sh.in @@ -46,11 +46,11 @@ if [ -z "$1" -o -z "$2" ]; then fi # So daemons know where to recall us if needed -export RC_SERVICE="$1" +RC_SERVICE="$1" ; export RC_SERVICE shift # Compat -export SVCNAME=$RC_SVCNAME +SVCNAME=$RC_SVCNAME ; export SVCNAME # Dependency function config() { |