[gentoo-commits] proj/eselect:master commit in: /, bin/

[gentoo-commits] proj/eselect:master commit in: /, bin/

[Ulrich Mueller]

commit:     45646c76e2cad5543370c5fe3bbfff78f2dac953
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 16:15:47 2012 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 16:15:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=45646c76

Remove any trailing backslash from ROOT before appending EPREFIX.

* bin/eselect.in (EROOT): Remove any trailing backslash from ROOT
before appending EPREFIX.

---
 ChangeLog      |    5 +++++
 bin/eselect.in |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d031f48..67b68ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-13  Ulrich Müller  <ulm@gentoo.org>
+
+	* bin/eselect.in (EROOT): Remove any trailing backslash from ROOT
+	before appending EPREFIX.
+
 2012-09-12  Ulrich Müller  <ulm@gentoo.org>
 
 	* modules/profile.eselect (get_symlink_location): When both

diff --git a/bin/eselect.in b/bin/eselect.in
index 95d58ac..fb1260f 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -43,7 +43,7 @@ ESELECT_KILL_TARGET="$$"
 
 # Support variables for Gentoo Prefix
 EPREFIX="@EPREFIX@"
-EROOT="${ROOT}${EPREFIX}"
+EROOT="${ROOT%/}${EPREFIX}"
 
 # Remove all alias definitions. Unset functions and variables that are
 # known to cause trouble.

[gentoo-commits] proj/eselect:master commit in: /, bin/

[Ulrich Mueller]

commit:     78b5fb759016a0b3b0da96137f633c89154d94d6
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 18:10:31 2012 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 18:10:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=78b5fb75

Remove trailing slash from ROOT only if EPREFIX is set.

* 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.

---
 ChangeLog      |    6 ++++++
 bin/eselect.in |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8de74a8..f610f77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-15  Ulrich Müller  <ulm@gentoo.org>
+
+	* 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.
+
 2012-09-13  Ulrich Müller  <ulm@gentoo.org>
 
 	* configure.ac: Update version to 1.3.2.

diff --git a/bin/eselect.in b/bin/eselect.in
index fb1260f..95bc77e 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -43,7 +43,7 @@ ESELECT_KILL_TARGET="$$"
 
 # Support variables for Gentoo Prefix
 EPREFIX="@EPREFIX@"
-EROOT="${ROOT%/}${EPREFIX}"
+EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}"
 
 # Remove all alias definitions. Unset functions and variables that are
 # known to cause trouble.

[gentoo-commits] proj/eselect:master commit in: /, bin/

[Ulrich Mueller]

commit:     f95b36d2beb19d53834e2f3c210fd0e0af79349e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  8 20:59:29 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Aug  8 20:59:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=f95b36d2

Configure check whether we are building from git.

* configure.ac: Check whether we are building from git;
include git revision in EXTRAVERSION if we do.
* bin/Makefile.am (dosed): Append EXTRAVERSION to VERSION.

---
 ChangeLog       |  6 ++++++
 bin/Makefile.am |  2 +-
 configure.ac    | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 46f4582..f5883ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-08  Ulrich Müller  <ulm@gentoo.org>
+
+	* configure.ac: Check whether we are building from git;
+	include git revision in EXTRAVERSION if we do.
+	* bin/Makefile.am (dosed): Append EXTRAVERSION to VERSION.
+
 2013-08-06  Ulrich Müller  <ulm@gentoo.org>
 
 	* libs/config.bash.in (store_config):

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 72b4812..7ba2996 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST = eselect.in
 dosed = @SED@ -e 's,\@BASH\@,$(BASH),g' \
 	      -e 's,\@DATADIR\@,$(datadir),g' \
 	      -e 's,\@EPREFIX\@,$(EPREFIX),g' \
-	      -e 's,\@VERSION\@,$(VERSION),g'
+	      -e 's,\@VERSION\@,$(VERSION)$(EXTRAVERSION),g'
 
 % : %.in
 	@echo "Building $@..."

diff --git a/configure.ac b/configure.ac
index 28e47da..8de7222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,20 @@ AS_CASE([$prefix],
 AC_MSG_RESULT([${EPREFIX:-nope}])
 AC_SUBST(EPREFIX)
 
+# Include extra version information when building from git
+AC_MSG_CHECKING([whether building from git])
+EXTRAVERSION=""
+if test -d ${GIT_DIR:-.git}; then
+    AC_MSG_RESULT(yes)
+    GITREV=`git rev-parse --short HEAD`
+    if test x$GITREV != x; then
+        EXTRAVERSION="-git-$GITREV"
+    fi
+else
+    AC_MSG_RESULT(no)
+fi
+AC_SUBST(EXTRAVERSION)
+
 AC_CONFIG_FILES(Makefile
 		doc/Makefile
 		man/Makefile

[gentoo-commits] proj/eselect:master commit in: /, bin/

[Ulrich Müller]

commit:     1a12d99d11ad55ad83b643f9f858e86a77e522d8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 08:31:23 2013 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 08:31:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=1a12d99d

Remove legacy --no-colour option.

* bin/eselect.in: Remove legacy --no-colour option.
Option --colour=no or --colour=never should be used instead.

---
 ChangeLog      | 3 +++
 bin/eselect.in | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7436537..384c22a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-10-21  Ulrich Müller  <ulm@gentoo.org>
 
+	* bin/eselect.in: Remove legacy --no-colour option.
+	Option --colour=no or --colour=never should be used instead.
+
 	* bin/eselect.in (es_find_module): Move function to core library.
 	* libs/core.bash.in (find_module): Rename and simplify.
 

diff --git a/bin/eselect.in b/bin/eselect.in
index e50fa8e..d5ba828 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -153,9 +153,6 @@ if [[ -z ${action} ]] && [[ -n ${1##--} ]]; then
 					*) die -q "Invalid argument for ${1%%=*} option" ;;
 				esac
 				;;
-			no-colour|no-color)	# legacy option
-				colour=no
-				;;
 			help|version)
 				action=${1##--}
 				;;

[gentoo-commits] proj/eselect:master commit in: /, bin/

[Ulrich Müller]

commit:     1a12d99d11ad55ad83b643f9f858e86a77e522d8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 08:31:23 2013 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 08:31:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=1a12d99d

Remove legacy --no-colour option.

* bin/eselect.in: Remove legacy --no-colour option.
Option --colour=no or --colour=never should be used instead.

---
 ChangeLog      | 3 +++
 bin/eselect.in | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7436537..384c22a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-10-21  Ulrich Müller  <ulm@gentoo.org>
 
+	* bin/eselect.in: Remove legacy --no-colour option.
+	Option --colour=no or --colour=never should be used instead.
+
 	* bin/eselect.in (es_find_module): Move function to core library.
 	* libs/core.bash.in (find_module): Rename and simplify.
 

diff --git a/bin/eselect.in b/bin/eselect.in
index e50fa8e..d5ba828 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -153,9 +153,6 @@ if [[ -z ${action} ]] && [[ -n ${1##--} ]]; then
 					*) die -q "Invalid argument for ${1%%=*} option" ;;
 				esac
 				;;
-			no-colour|no-color)	# legacy option
-				colour=no
-				;;
 			help|version)
 				action=${1##--}
 				;;

[gentoo-commits] proj/eselect:master commit in: /, bin/

[Ulrich Müller]

commit:     b1890839e5719c7affcaf22403073295c73aed98
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 17:03:30 2013 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 17:03:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=b1890839

Remove deprecated es_do_list_{options,modules} functions.

* bin/eselect.in (es_do_list_options, es_do_list_modules):
Remove deprecated functions.
(es_do_help): Move code for listing options and modules to here.

---
 ChangeLog      |  6 ++++++
 bin/eselect.in | 28 +++++++++-------------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 384c22a..f06969f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-22  Ulrich Müller  <ulm@gentoo.org>
+
+	* bin/eselect.in (es_do_list_options, es_do_list_modules):
+	Remove deprecated functions.
+	(es_do_help): Move code for listing options and modules to here.
+
 2013-10-21  Ulrich Müller  <ulm@gentoo.org>
 
 	* bin/eselect.in: Remove legacy --no-colour option.

diff --git a/bin/eselect.in b/bin/eselect.in
index d5ba828..b1dc5d9 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -82,9 +82,14 @@ es_do_help() {
 	set_output_mode default
 	es_do_usage
 	echo
-	es_do_list_options
+	# display all recognized global options
+	write_list_start "Global options:"
+	write_kv_list_entry "--brief" "Make output shorter"
+	write_kv_list_entry "--colour=<yes|no|auto>" \
+		"Enable or disable colour output (default 'auto')"
 	echo
-	es_do_list_modules
+	# display all available eselect modules
+	do_action modules list
 }
 
 # es_do_version
@@ -96,21 +101,6 @@ es_do_version() {
 	echo "Distributed under the terms of the GNU GPL version 2 or later."
 }
 
-# es_do_list_options
-# Display all recognized global options
-es_do_list_options() {
-	write_list_start "Global options:"
-	write_kv_list_entry "--brief" "Make output shorter"
-	write_kv_list_entry "--colour=<yes|no|auto>" \
-		"Enable or disable colour output (default 'auto')"
-}
-
-# es_do_list_modules
-# Display all available eselect modules DEPRECATED
-es_do_list_modules() {
-	do_action modules list "$@"
-}
-
 ### main code ###
 
 # figure out what the action is. we need to know whether we're
@@ -178,9 +168,9 @@ fi
 unset colour
 
 if [[ -n ${action} ]]; then
-	if is_function "es_do_${action//-/_}"; then
+	if is_function "es_do_${action}"; then
 		[[ $# -gt 0 ]] && die -q "Too many parameters"
-		es_do_${action//-/_}
+		es_do_${action}
 	else
 		do_action "${action}" "$@"
 	fi

[gentoo-commits] proj/eselect:master commit in: /, bin/

[Ulrich Müller]

commit:     dc9fac81f559a79b660bccc89e105afb314dd3e0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  5 11:16:32 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  5 11:16:32 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=dc9fac81

Always parse global options. Respect "--".

* bin/eselect.in: Parse global options even if we are invoked
as something-config or similar. Respect "--" to indicate end
of options.

---
 ChangeLog      |  6 ++++++
 bin/eselect.in | 64 ++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 03fe042..c3f0061 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-05  Ulrich Müller  <ulm@gentoo.org>
+
+	* bin/eselect.in: Parse global options even if we are invoked
+	as something-config or similar. Respect "--" to indicate end
+	of options.
+
 2014-05-24  Ulrich Müller  <ulm@gentoo.org>
 
 	* configure.ac: Update version to 1.4.2.

diff --git a/bin/eselect.in b/bin/eselect.in
index 70e1c20..e2f29ea 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -126,34 +126,40 @@ if [[ -z ${action} ]]; then
 	unset binname prefix
 fi
 
-if [[ -z ${action} ]] && [[ -n ${1##--} ]]; then
-	while [[ ${1##--} != "$1" ]]; do
-		case ${1##--} in
-			brief)
-				set_output_mode brief
-				;;
-			colour=*|color=*|colour|color)
-				# accept all arguments that are valid for ls or emerge
-				case ${1#*=} in
-					yes|y|always|force|$1) colour=yes ;;
-					no|n|never|none) colour=no ;;
-					auto|tty|if-tty) colour="" ;;
-					*) die -q "Invalid argument for ${1%%=*} option" ;;
-				esac
-				;;
-			help|version)
-				action=${1##--}
-				;;
-			*)
-				die -q "Unknown option $1"
-				;;
-		esac
-		shift
-	done
-	if [[ -z ${action} ]]; then
-		action=$1
-		shift
-	fi
+# parse global options
+while [[ ${1##--} != "$1" ]]; do
+	case ${1##--} in
+		brief)
+			set_output_mode brief
+			;;
+		colour=*|color=*|colour|color)
+			# accept all arguments that are valid for ls or emerge
+			case ${1#*=} in
+				yes|y|always|force|$1) colour=yes ;;
+				no|n|never|none) colour=no ;;
+				auto|tty|if-tty) colour="" ;;
+				*) die -q "Invalid argument for ${1%%=*} option" ;;
+			esac
+			;;
+		help|version)
+			[[ -z ${action} ]] || die -q "Too many parameters"
+			action=${1##--}
+			;;
+		"")
+			# -- indicates end of options
+			shift
+			break
+			;;
+		*)
+			die -q "Unknown option $1"
+			;;
+	esac
+	shift
+done
+
+if [[ -z ${action} && $# -gt 0 ]]; then
+	action=$1
+	shift
 fi
 
 # enable colour output and get width of terminal iff stdout is a tty
@@ -167,7 +173,7 @@ unset colour
 
 if [[ -n ${action} ]]; then
 	if is_function "es_do_${action}"; then
-		[[ $# -gt 0 ]] && die -q "Too many parameters"
+		[[ $# -eq 0 ]] || die -q "Too many parameters"
 		es_do_${action}
 	else
 		do_action "${action}" "$@"

[gentoo-commits] proj/eselect:master commit in: /, bin/

[Ulrich Müller]

commit:     81dc05871392f5acbf5fadb5bb1991c737e42a5f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  5 17:59:33 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun  5 17:59:33 2023 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=81dc0587

Sanitise PATH

* bin/eselect.in (PATH): Sanitise, remove Portage's internal
ebuild-helpers dir from it.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog      |  3 +++
 bin/eselect.in | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 701fb9c..fe99690 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-06-05  Ulrich Müller  <ulm@gentoo.org>
 
+	* bin/eselect.in (PATH): Sanitise, remove Portage's internal
+	ebuild-helpers dir from it.
+
 	* bin/eselect.in (EPREFIX): Quote argument of ":" command.
 	This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223
 	Add some more quotes throughout.

diff --git a/bin/eselect.in b/bin/eselect.in
index c59a09d..483a572 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -53,13 +53,24 @@ EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}"
 "unalias" -a
 unset -f rm
 unset CDPATH GLOBIGNORE
-IFS=$' \t\n'
 
 shopt -s extglob
 shopt -s expand_aliases
 
 umask +rx
 
+# Sanitise PATH: We don't want to execute Portage's internal helpers
+# if we're called from an ebuild.
+IFS=:
+read -r -d '' -a path <<<"${PATH}"
+for i in "${!path[@]}"; do
+	[[ ${path[i]} == */portage?(/*)/ebuild-helpers?(/*) ]] && unset "path[i]"
+done
+PATH="${path[*]}"
+unset i path
+
+IFS=$' \t\n'
+
 # Save stderr file descriptor
 if (( BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1 || BASH_VERSINFO[0] > 4 ))
 then

[gentoo-commits] proj/eselect:master commit in: /, bin/

[Ulrich Müller]

commit:     9869b3f98c95ec154b7ac5b2af8bcf6201d8127a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  7 08:50:02 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jun  7 08:50:02 2023 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=9869b3f9

Use printf instead of echo

* bin/eselect.in (PATH): Use printf instead of echo

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog      | 2 ++
 bin/eselect.in | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aba58d1..87efe93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2023-06-07  Ulrich Müller  <ulm@gentoo.org>
 
+	* bin/eselect.in (PATH): Use printf instead of echo.
+
 	* configure.ac: Update version to 1.4.24.
 	* Tagged 1.4.24 release.
 

diff --git a/bin/eselect.in b/bin/eselect.in
index 41d53d7..36581e1 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -62,7 +62,7 @@ umask +rx
 # Sanitise PATH: We don't want to execute Portage's internal helpers
 # if we're called from an ebuild.
 IFS=:
-read -r -d '' -a path < <(echo -n "${PATH}")
+read -r -d '' -a path < <(printf '%s\0' "${PATH}")
 for i in "${!path[@]}"; do
 	[[ ${path[i]} == */portage?(/*)/ebuild-helpers?(/*) ]] && unset "path[i]"
 done