emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkbashisms: clean up export statements.

Browse Source 
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
This commit is contained in:
Robin H. Johnson
2012-11-07 00:22:33 +00:00
parent 3809eac54d
commit 1b0130961e
13 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sh/functions.sh.in
View File

@@ -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

4
sh/gendepends.sh.in
View File

@@ -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

2
sh/ifwatchd-carrier.sh.in
View File

@@ -1,5 +1,5 @@
#!@SHELL@
# Wrapper for ifwatchd(8)
export IN_BACKGROUND=yes
IN_BACKGROUND=yes ; export IN_BACKGROUND
$RC_SERVICE --quiet start

2
sh/ifwatchd-nocarrier.sh.in
View File

@@ -1,5 +1,5 @@
#!@SHELL@
# Wrapper for ifwatchd(8)
export IN_BACKGROUND=yes
IN_BACKGROUND=yes ; export IN_BACKGROUND
$RC_SERVICE --quiet stop

2
sh/rc-functions.sh.in
View File

@@ -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

4
sh/runscript.sh.in
View File

@@ -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() {