* [gentoo-commits] proj/eselect:master commit in: libs/, /, modules/
@ 2014-08-28 13:02 Ulrich Müller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2014-08-28 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 759fb65536efbd7efd171d0fb8e461d192b5c0d9
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 28 12:53:42 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 28 12:53:42 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=759fb655
Remove redundant $@ in "for" loops throughout.
* libs/core.bash.in (inherit):
* libs/tests.bash.in (has):
* modules/config.eselect (generic_handle_one_file, accept_handler)
(merge_handler, display_handler):
* modules/news.eselect (find_items, do_list, do_read, do_unread):
* modules/rc.eselect (run_runscript, do_show): Remove redundant $@
in "for" loops throughout.
---
ChangeLog | 10 ++++++++++
libs/core.bash.in | 2 +-
libs/tests.bash.in | 2 +-
modules/config.eselect | 8 ++++----
modules/news.eselect | 8 ++++----
modules/rc.eselect | 4 ++--
6 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1f01c16..92d7730 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-08-28 Ulrich Müller <ulm@gentoo.org>
+
+ * libs/core.bash.in (inherit):
+ * libs/tests.bash.in (has):
+ * modules/config.eselect (generic_handle_one_file, accept_handler)
+ (merge_handler, display_handler):
+ * modules/news.eselect (find_items, do_list, do_read, do_unread):
+ * modules/rc.eselect (run_runscript, do_show): Remove redundant $@
+ in "for" loops throughout.
+
2014-06-05 Ulrich Müller <ulm@gentoo.org>
* misc/eselect.bashcomp (_eselect): Improve handling of options
diff --git a/libs/core.bash.in b/libs/core.bash.in
index 1384188..cc263b8 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -111,7 +111,7 @@ do_action() {
# Sources a given eselect library file
inherit() {
local x
- for x in "$@"; do
+ for x; do
[[ -e ${ESELECT_CORE_PATH}/${x}.bash ]] \
|| die "Couldn't find ${x}.bash"
source "${ESELECT_CORE_PATH}/${x}.bash" \
diff --git a/libs/tests.bash.in b/libs/tests.bash.in
index eeafc94..8fb8559 100644
--- a/libs/tests.bash.in
+++ b/libs/tests.bash.in
@@ -20,7 +20,7 @@
has() {
local test=${1} item
shift
- for item in "$@" ; do
+ for item; do
[[ ${item} == ${test} ]] && return 0
done
return 1
diff --git a/modules/config.eselect b/modules/config.eselect
index dfa3826..7383b2f 100644
--- a/modules/config.eselect
+++ b/modules/config.eselect
@@ -62,7 +62,7 @@ generic_handle_one_file() {
local file_raw file
# for each parameter...
- for file_raw in "$@" ; do
+ for file_raw; do
[[ -z ${file_raw} ]] && continue
# do we have a number or a name?
@@ -162,7 +162,7 @@ do_accept() {
accept_handler() {
local file
- for file in "$@" ; do
+ for file; do
local sfile="${file}" dfile="${file/._cfg????_}"
echo "Replacing ${dfile} with ${sfile}..."
mv --interactive "${sfile}" "${dfile}"
@@ -201,7 +201,7 @@ do_merge() {
merge_handler() {
local file
- for file in "$@" ; do
+ for file; do
local sfile="${file}" dfile="${file/._cfg????_}"
echo "Merging ${dfile} with ${sfile}..."
merge_prog ${dfile} ${sfile}
@@ -242,7 +242,7 @@ do_display() {
display_handler() {
local file
- for file in "$@" ; do
+ for file; do
local sfile="${file}" dfile="${file/._cfg????_}"
echo "Proposed changes to ${dfile}:"
diff_prog -u ${dfile} ${sfile}
diff --git a/modules/news.eselect b/modules/news.eselect
index 782f81c..3cc1f84 100644
--- a/modules/news.eselect
+++ b/modules/news.eselect
@@ -15,7 +15,7 @@ NEWS_DIR="/var/lib/gentoo/news"
# sort order: by item name (i.e. effectively by date)
find_items() {
local stat repos=$(get_repositories) repo file item
- for stat in "$@"; do
+ for stat; do
for repo in ${repos}; do
file="${EROOT}${NEWS_DIR}/news-${repo}.${stat}"
[[ -f ${file} ]] || continue
@@ -174,7 +174,7 @@ do_list() {
set -- $(find_items unread read)
write_list_start "News items:"
- for item in "$@"; do
+ for item; do
stat=${item%%/*}; item=${item#*/}
repo=${item%%/*}; item=${item#*/}
find_repo_dir "${repo}"
@@ -270,7 +270,7 @@ do_read() {
&& echo "No news is good news."
fi
- for i in "$@"; do
+ for i; do
if ! is_number "${i}" || [[ ${i} -lt 1 || ${i} -gt ${#items[@]} ]]
then
write_warning_msg "Bad item number: ${i}"
@@ -378,7 +378,7 @@ do_unread() {
set -- ${seq}
fi
- for i in "$@"; do
+ for i; do
if ! is_number "${i}" || [[ ${i} -lt 1 || ${i} -gt ${#items[@]} ]]
then
write_warning_msg "Bad item number: ${i}"
diff --git a/modules/rc.eselect b/modules/rc.eselect
index f02abf7..6e1d3e5 100644
--- a/modules/rc.eselect
+++ b/modules/rc.eselect
@@ -90,7 +90,7 @@ show_script_status() {
run_runscript() {
local command=${1}
shift
- for script in "$@"; do
+ for script; do
is_script "${EROOT}/etc/init.d/${script}" \
&& /sbin/runscript "${EROOT}/etc/init.d/${script}" "${command}"
done
@@ -250,7 +250,7 @@ do_show() {
fi
fi
- for runlevel in "$@"; do
+ for runlevel; do
[[ -n ${runlevel} && -d ${EROOT}/etc/runlevels/${runlevel} ]] \
|| die -q "\"${runlevel}\" is no valid runlevel"
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/eselect:master commit in: libs/, /, modules/
@ 2013-08-06 17:09 Ulrich Mueller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Mueller @ 2013-08-06 17:09 UTC (permalink / raw
To: gentoo-commits
commit: cc328120d3e55456e68a8823caaf02c8a43e742f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 6 16:44:22 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 6 16:44:22 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=cc328120
Declare IFS as local variable.
* libs/config.bash.in (store_config):
* libs/default.eselect.in (show_usage_message):
* libs/editor-variable.bash.in (do_set):
* libs/output.bash.in (write_kv_list_entry):
* modules/env.eselect (create_profile_env, create_prelink_conf):
* modules/news.eselect (do_list, do_read):
Declare IFS as local variable.
---
ChangeLog | 10 ++++++++++
libs/config.bash.in | 3 +--
libs/default.eselect.in | 6 +++---
libs/editor-variable.bash.in | 4 ++--
libs/output.bash.in | 6 ++----
modules/env.eselect | 13 +++++--------
modules/news.eselect | 11 +++++------
7 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8f1bfff..46f4582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-08-06 Ulrich Müller <ulm@gentoo.org>
+
+ * libs/config.bash.in (store_config):
+ * libs/default.eselect.in (show_usage_message):
+ * libs/editor-variable.bash.in (do_set):
+ * libs/output.bash.in (write_kv_list_entry):
+ * modules/env.eselect (create_profile_env, create_prelink_conf):
+ * modules/news.eselect (do_list, do_read):
+ Declare IFS as local variable.
+
2013-08-05 Ulrich Müller <ulm@gentoo.org>
* man/bashcomp.eselect.5: Remove stale man page.
diff --git a/libs/config.bash.in b/libs/config.bash.in
index 9b8cdd8..e5e0089 100644
--- a/libs/config.bash.in
+++ b/libs/config.bash.in
@@ -55,8 +55,7 @@ store_config() {
(
# parse the names of all settings in the file
- local ifs_save=${IFS-$' \t\n'}
- IFS=$'\n'
+ local ifs_save=${IFS} IFS=$'\n'
for line in ${content} ; do
[[ ${line/=/} != ${line} ]] || continue
line=${line/=*/}
diff --git a/libs/default.eselect.in b/libs/default.eselect.in
index e214596..5783a8d 100644
--- a/libs/default.eselect.in
+++ b/libs/default.eselect.in
@@ -53,7 +53,7 @@ show_usage_message() {
continue
;;
?*)
- local desc="" ifs_save="${IFS}" action_text line options
+ local desc="" action_text line options
is_function "describe_${action}" && desc=$(describe_${action})
if is_function "describe_${action}_parameters"; then
@@ -66,13 +66,13 @@ show_usage_message() {
if is_function "describe_${action}_options"; then
options=$(describe_${action}_options)
- IFS=$'\n'
+ local ifs_save=${IFS} IFS=$'\n'
for line in ${options}; do
write_kv_list_entry -p \
" ${line%%*( ):*}" \
" ${line##+([^:]):*( )}"
done
- IFS="${ifs_save}"
+ IFS=${ifs_save}
fi
;;
esac
diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in
index 4de9736..e377832 100644
--- a/libs/editor-variable.bash.in
+++ b/libs/editor-variable.bash.in
@@ -119,7 +119,7 @@ do_set() {
[[ -z $1 ]] && die -q "You didn't tell me what to set the variable to"
[[ $# -gt 1 ]] && die -q "Too many parameters"
- local target=$1 targets=() dir ifs_save=${IFS-$' \t\n'}
+ local target=$1 targets=() dir
# target may be specified by its name or its index
if is_number "${target}"; then
@@ -132,7 +132,7 @@ do_set() {
if [[ ${EDITOR_LIST} != *:* ]]; then
# is the target an absolute path? if not, try to find it
if [[ ${target} != /* ]]; then
- IFS=:
+ local ifs_save=${IFS} IFS=:
for dir in ${EDITOR_PATH-/bin:/usr/bin}; do
[[ -f ${EROOT}${dir}/${target} ]] || continue
target=${EPREFIX}${dir}/${target}
diff --git a/libs/output.bash.in b/libs/output.bash.in
index fd08844..bf29721 100644
--- a/libs/output.bash.in
+++ b/libs/output.bash.in
@@ -88,11 +88,10 @@ write_list_start() {
# Args may include text highlighting. If -p is passed, use 'plain'
# highlighting rather than bold.
write_kv_list_entry() {
- local n text key val lindent rindent ifs_save=${IFS}
+ local n text key val lindent rindent
local left=${COLOUR_LIST_LEFT} right=${COLOUR_LIST_RIGHT}
local normal=${COLOUR_NORMAL}
-
- IFS=$' \t\n'
+ local IFS=$' \t\n'
if [[ ${1} == "-p" ]] ; then
left=; right=; normal=
@@ -150,7 +149,6 @@ write_kv_list_entry() {
echo -n -e "${cwords}"
fi
echo -e "${normal}"
- IFS=${ifs_save}
}
# write_numbered_list_entry PUBLIC
diff --git a/modules/env.eselect b/modules/env.eselect
index bdc396d..6c77005 100644
--- a/modules/env.eselect
+++ b/modules/env.eselect
@@ -82,7 +82,7 @@ update_envvar_classes() {
# Create profile.env file
create_profile_env() {
local -a envfiles
- local vars store items tmpprofile ifs_save
+ local vars store items tmpprofile ifs_save=${IFS}
envfiles=( "${EROOT}"/etc/env.d/* )
# Blank the file first!
@@ -116,8 +116,7 @@ create_profile_env() {
store=$(load_config "${envfile}" ${var})
else
items=$(load_config "${envfile}" ${var})
- ifs_save=${IFS-$' \t\n'}
- IFS=":"
+ local IFS=:
for item in ${items}; do
has ${item} ${store} \
|| store="${store}${store:+:}${item}"
@@ -146,8 +145,7 @@ create_profile_env() {
has LDPATH ${vars} || continue
# Store LDPATH for later processing
items=$(load_config "${envfile}" LDPATH)
- ifs_save=${IFS-$' \t\n'}
- IFS=":"
+ local IFS=:
items=( ${items} )
IFS=${ifs_save}
for item in "${items[@]}"; do
@@ -183,7 +181,7 @@ create_ld_so_conf() {
create_prelink_conf() {
[[ -z ${ESELECT_LDPATH[@]} ]] \
&& die -q "No LDPATHs found in ${EROOT}/etc/env.d/*"
- local path prelink_path prelink_mask str x ifs_save
+ local path prelink_path prelink_mask str x
str="# prelink.conf autogenerated by eselect\n"
str="${str}# Make all changes to /etc/env.d files\n"
# Add default items
@@ -197,8 +195,7 @@ create_prelink_conf() {
path=$(load_config "${ENVPROFILE}" PATH)
prelink_path=$(load_config "${ENVPROFILE}" PRELINK_PATH)
prelink_mask=$(load_config "${ENVPROFILE}" PRELINK_PATH_MASK)
- ifs_save=${IFS-$' \t\n'}
- IFS=":"
+ local ifs_save=${IFS} IFS=:
for x in ${path} ${prelink_path} "${ESELECT_LDPATH[@]}"; do
has ${x} ${prelink_mask} && continue
[[ -z ${x##*/} ]] || x="${x}/"
diff --git a/modules/news.eselect b/modules/news.eselect
index dd6b3bd..c48b9c1 100644
--- a/modules/news.eselect
+++ b/modules/news.eselect
@@ -164,8 +164,7 @@ describe_list() {
do_list() {
local item stat repo dir header line title posted i=1
- local cols=${COLUMNS:-80}
- local ifs_save=${IFS-$' \t\n'}
+ local cols=${COLUMNS:-80} ifs_save=${IFS}
local -a repos dirs
set -- $(find_items unread read)
@@ -179,7 +178,7 @@ do_list() {
[[ ${posted} == +([0-9])-+([0-9])-+([0-9]) ]] || posted="(no date) "
header=$(read_item "${dir}" "${item}" header) \
|| title="(${item} - removed?)"
- IFS=$'\n'
+ local IFS=$'\n'
for line in ${header}; do
case "${line%%:*}" in
Title) title=${line##*([^:]):*([[:space:]])} ;;
@@ -242,7 +241,7 @@ describe_read_parameters() {
do_read() {
local -a items=( $(find_items unread read) ) repos dirs
- local n=${#items[@]} format=cooked ifs_save=${IFS-$' \t\n'}
+ local n=${#items[@]} format=cooked ifs_save=${IFS}
local item repo stat dir header line i seq repos_upd author title posted
while [[ $# -gt 0 ]]; do
@@ -283,7 +282,7 @@ do_read() {
cooked)
write_list_start "${item}"
header=$(read_item "${dir}" "${item}" header)
- IFS=$'\n'
+ local IFS=$'\n'
for line in ${header}; do
case "${line%%:*}" in
Title)
@@ -303,7 +302,7 @@ do_read() {
mbox)
if header=$(read_item "${dir}" "${item}" header); then
author=""; title=""; posted=""
- IFS=$'\n'
+ local IFS=$'\n'
for line in ${header}; do
case "${line%%:*}" in
Author) : ${author:=${line##*([^:]):*([[:space:]])}} ;;
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/eselect:master commit in: libs/, /, modules/
@ 2013-07-07 12:30 Ulrich Mueller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Mueller @ 2013-07-07 12:30 UTC (permalink / raw
To: gentoo-commits
commit: eeb450b9979960112388251e725ce4f6c70f184f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 7 12:30:06 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 12:30:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=eeb450b9
Fix return status in editor-variable lib and locale module, bug 473308.
* libs/editor-variable.bash.in (do_set):
* modules/locale.eselect (do_set): Don't return bad status when
ROOT is nontrivial, bug 473308. Thanks to <smkbot <AT> gmail.com>.
---
ChangeLog | 6 ++++++
libs/editor-variable.bash.in | 6 ++++--
modules/locale.eselect | 6 ++++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f55c083..38284d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-07 Ulrich Müller <ulm@gentoo.org>
+
+ * libs/editor-variable.bash.in (do_set):
+ * modules/locale.eselect (do_set): Don't return bad status when
+ ROOT is nontrivial, bug 473308. Thanks to <smkbot@gmail.com>.
+
2013-07-06 Ulrich Müller <ulm@gentoo.org>
* configure.ac: Update version to 1.3.6.
diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in
index 0ddea92..4de9736 100644
--- a/libs/editor-variable.bash.in
+++ b/libs/editor-variable.bash.in
@@ -155,8 +155,10 @@ do_set() {
# update profile
do_action env update noldconfig
- [[ ${ROOT:-/} = / ]] && echo \
- "Run \". ${EROOT}/etc/profile\" to update the variable in your shell."
+ if [[ ${ROOT:-/} = / ]]; then
+ echo "Run \". ${EROOT}/etc/profile\" to update the variable" \
+ "in your shell."
+ fi
}
### update action ###
diff --git a/modules/locale.eselect b/modules/locale.eselect
index e01478d..1f2cd29 100644
--- a/modules/locale.eselect
+++ b/modules/locale.eselect
@@ -125,6 +125,8 @@ do_set() {
# update profile
do_action env update noldconfig
- [[ ${ROOT:-/} = / ]] && echo \
- "Run \". ${EROOT}/etc/profile\" to update the variable in your shell."
+ if [[ ${ROOT:-/} = / ]]; then
+ echo "Run \". ${EROOT}/etc/profile\" to update the variable" \
+ "in your shell."
+ fi
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/eselect:master commit in: libs/, /, modules/
@ 2012-10-11 19:47 Ulrich Mueller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Mueller @ 2012-10-11 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 1be0f713e5b1412f021198b283b30aa7592dfc22
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 19:53:49 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 19:53:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=1be0f713
Recognise profiles whose names contain a hyphen, bug 437986.
* libs/package-manager.bash.in (arch): Add amd64 as case label.
* modules/profile.eselect (set_symlink): Include underscore and
hyphen in regexp, because both are allowed in keyword names,
bug 437986. Thanks to Yuta Satoh <nigoro.gentoo <AT> 0x100.com>.
---
ChangeLog | 7 +++++++
libs/package-manager.bash.in | 2 +-
modules/profile.eselect | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eadc072..857a31f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-11 Ulrich Müller <ulm@gentoo.org>
+
+ * libs/package-manager.bash.in (arch): Add amd64 as case label.
+ * modules/profile.eselect (set_symlink): Include underscore and
+ hyphen in regexp, because both are allowed in keyword names,
+ bug 437986. Thanks to Yuta Satoh <nigoro.gentoo@0x100.com>.
+
2012-09-15 Ulrich Müller <ulm@gentoo.org>
* libs/editor-variable.bash.in (do_set):
diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in
index 55a48a6..d1ce36e 100644
--- a/libs/package-manager.bash.in
+++ b/libs/package-manager.bash.in
@@ -55,7 +55,7 @@ arch() {
ret=$(uname -m)
case ${ret} in
- alpha|ia64|m68k|ppc|ppc64) ;;
+ alpha|amd64|ia64|m68k|ppc|ppc64) ;;
arm*) ret=arm ;;
i?86) ret=x86 ;;
mips*) ret=mips ;;
diff --git a/modules/profile.eselect b/modules/profile.eselect
index 5adccd1..6db3dd5 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -95,7 +95,7 @@ set_symlink() {
repopath=$(get_repo_path "${repo}") || die -q "get_repo_path failed"
# do a reverse lookup and find the arch associated with ${target}
parch=$(sed -n -e \
- "s|^\([[:alnum:]]\+\)[[:space:]].*${target}[[:space:]].*$|\1|p" \
+ "s|^\([[:alnum:]_-]\+\)[[:space:]].*${target}[[:space:]].*$|\1|p" \
"${repopath}/profiles/profiles.desc")
[[ ${arch} != "${parch}" && -z ${force} ]] \
&& die -q "${target} is not a valid profile for ${arch}"
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] proj/eselect:master commit in: libs/, /, modules/
@ 2012-09-15 20:35 Ulrich Mueller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Mueller @ 2012-09-15 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 08806f2a29db0d9c182ab5b54a6943b3ebb65f0d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 20:34:08 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 20:34:08 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=08806f2a
Prefix /etc/profile with EROOT in output message, bug 429960.
* libs/editor-variable.bash.in (do_set):
* modules/locale.eselect (do_set): Output message only if ROOT
is /, and prefix /etc/profile with EROOT, bug 429960.
---
ChangeLog | 4 ++++
libs/editor-variable.bash.in | 3 ++-
modules/locale.eselect | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f610f77..eadc072 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-09-15 Ulrich Müller <ulm@gentoo.org>
+ * libs/editor-variable.bash.in (do_set):
+ * modules/locale.eselect (do_set): Output message only if ROOT
+ is /, and prefix /etc/profile with EROOT, bug 429960.
+
* bin/eselect.in (EROOT): Remove trailing slash from ROOT only
if EPREFIX is set. This guarantees that EROOT is equal to ROOT
for empty EPREFIX.
diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in
index a431a4f..a8d4252 100644
--- a/libs/editor-variable.bash.in
+++ b/libs/editor-variable.bash.in
@@ -155,7 +155,8 @@ do_set() {
# update profile
do_action env update noldconfig
- echo "Run \". /etc/profile\" to update the variable in your shell."
+ [[ ${ROOT:-/} = / ]] && echo \
+ "Run \". ${EROOT}/etc/profile\" to update the variable in your shell."
}
### update action ###
diff --git a/modules/locale.eselect b/modules/locale.eselect
index cb19f63..49b4826 100644
--- a/modules/locale.eselect
+++ b/modules/locale.eselect
@@ -125,5 +125,6 @@ do_set() {
# update profile
do_action env update noldconfig
- echo "Run \". /etc/profile\" to update the variable in your shell."
+ [[ ${ROOT:-/} = / ]] && echo \
+ "Run \". ${EROOT}/etc/profile\" to update the variable in your shell."
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-08-28 13:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-28 13:02 [gentoo-commits] proj/eselect:master commit in: libs/, /, modules/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2013-08-06 17:09 Ulrich Mueller
2013-07-07 12:30 Ulrich Mueller
2012-10-11 19:47 Ulrich Mueller
2012-09-15 20:35 Ulrich Mueller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox