public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: app-admin/eselect/files/
@ 2012-02-09  0:09 Sebastien Fabbro
  0 siblings, 0 replies; 5+ messages in thread
From: Sebastien Fabbro @ 2012-02-09  0:09 UTC (permalink / raw
  To: gentoo-commits

commit:     581ebfac007cf37e343e535687dd7a2bf6b0ccb7
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Thu Feb  9 00:07:16 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 00:07:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=581ebfac

EROOT fix

---
 app-admin/eselect/files/eselect-alternatives.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/app-admin/eselect/files/eselect-alternatives.patch b/app-admin/eselect/files/eselect-alternatives.patch
index 1aafdb0..9401538 100644
--- a/app-admin/eselect/files/eselect-alternatives.patch
+++ b/app-admin/eselect/files/eselect-alternatives.patch
@@ -75,7 +75,7 @@ Index: libs/Makefile.am
 +inherit config output path-manipulation
 +
 +ALTERNATIVESDIR_ROOTLESS="@sysconfdir@/env.d/alternatives"
-+ALTERNATIVESDIR="${ALTERNATIVESDIR_ROOTLESS}"
++ALTERNATIVESDIR="${EROOT}${ALTERNATIVESDIR_ROOTLESS}"
 +
 +get_current_provider() {
 +    local dieprefix="Could not determine current provider for ${ALTERNATIVE}"



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-admin/eselect/files/
@ 2013-02-15 15:53 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2013-02-15 15:53 UTC (permalink / raw
  To: gentoo-commits

commit:     0185905744d9cc7eaa73bf7ce999c8117eb191f6
Author:     Justin <jlec <AT> j-schmitz <DOT> net>
AuthorDate: Thu Feb 14 20:47:19 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 20:47:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=01859057

Typo

---
 app-admin/eselect/files/eselect-alternatives.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/app-admin/eselect/files/eselect-alternatives.patch b/app-admin/eselect/files/eselect-alternatives.patch
index 9401538..13f0593 100644
--- a/app-admin/eselect/files/eselect-alternatives.patch
+++ b/app-admin/eselect/files/eselect-alternatives.patch
@@ -6,7 +6,7 @@ Index: bin/eselect.in
  # Where are modules installed by default?
  ESELECT_DEFAULT_MODULES_PATH="${ESELECT_DATA_PATH}/modules"
  
-+# Where are auto-generated modules placed? (e.g. from alternatives-2.eclas)
++# Where are auto-generated modules placed? (e.g. from alternatives-2.eclass)
 +ESELECT_AUTO_GENERATED_MODULES_PATH="${ESELECT_DEFAULT_MODULES_PATH}/auto"
 +
  # Look in these places for modules


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-admin/eselect/files/
@ 2015-12-21 10:38 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-12-21 10:38 UTC (permalink / raw
  To: gentoo-commits

commit:     6ab465f8ee2c8f0001419e42cd9705c3b1858634
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 10:31:59 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 10:31:59 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6ab465f8

app-admin/eselect: Update patch to latest changes

Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-admin/eselect/files/eselect-1.4.5-alternatives.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/eselect/files/eselect-1.4.5-alternatives.patch b/app-admin/eselect/files/eselect-1.4.5-alternatives.patch
index 699f17b..1d54172 100644
--- a/app-admin/eselect/files/eselect-1.4.5-alternatives.patch
+++ b/app-admin/eselect/files/eselect-1.4.5-alternatives.patch
@@ -251,7 +251,7 @@ index 027ef73..a5fe373 100644
  	@$(dosed) $< > $@
 diff --git a/libs/alternatives-common.bash.in b/libs/alternatives-common.bash.in
 new file mode 100644
-index 0000000..10d6616
+index 0000000..8753b89
 --- /dev/null
 +++ b/libs/alternatives-common.bash.in
 @@ -0,0 +1,510 @@
@@ -547,7 +547,7 @@ index 0000000..10d6616
 +	elif [[ ! -d "${provider_dir}" ]]; then
 +		die "${provider_dir} exists but is a file"
 +	else
-+		die "${provider_dir} already present. You need ot remove it before adding it again"
++		die "${provider_dir} already present. You need to remove it before adding it again"
 +	fi
 +
 +	# Make sure importance is a signed integer


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-admin/eselect/files/
@ 2018-06-09 20:34 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2018-06-09 20:34 UTC (permalink / raw
  To: gentoo-commits

commit:     d39b8890d1ed73efb2035a5b2689d3cb7c72fcb5
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  9 20:34:06 2018 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun  9 20:34:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d39b8890

app-admin/eselect: Update Patch

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/eselect-1.4.13-alternatives.patch        | 41 +++++++++++-----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/app-admin/eselect/files/eselect-1.4.13-alternatives.patch b/app-admin/eselect/files/eselect-1.4.13-alternatives.patch
index 1d541722c..4e7455e6d 100644
--- a/app-admin/eselect/files/eselect-1.4.13-alternatives.patch
+++ b/app-admin/eselect/files/eselect-1.4.13-alternatives.patch
@@ -1,12 +1,12 @@
  bin/Makefile.am                  |   1 +
  bin/eselect.in                   | 150 +++++++++++-
  libs/Makefile.am                 |   7 +-
- libs/alternatives-common.bash.in | 510 +++++++++++++++++++++++++++++++++++++++
+ libs/alternatives-common.bash.in | 509 +++++++++++++++++++++++++++++++++++++++
  libs/alternatives.bash.in        | 316 ++++++++++++++++++++++++
  modules/Makefile.am              |   1 +
  modules/alternatives.eselect     | 178 ++++++++++++++
  modules/modules.eselect          | 288 ++++++++++++++--------
- 8 files changed, 1343 insertions(+), 108 deletions(-)
+ 8 files changed, 1342 insertions(+), 108 deletions(-)
 
 diff --git a/bin/Makefile.am b/bin/Makefile.am
 index 20902c1..ad08867 100644
@@ -21,7 +21,7 @@ index 20902c1..ad08867 100644
  
  % : %.in
 diff --git a/bin/eselect.in b/bin/eselect.in
-index 934a10a..5242ed3 100755
+index 432f4e8..840eb94 100755
 --- a/bin/eselect.in
 +++ b/bin/eselect.in
 @@ -22,10 +22,18 @@ ESELECT_DATA_PATH="@DATADIR@/eselect"
@@ -46,7 +46,7 @@ index 934a10a..5242ed3 100755
  
  # Look in this place for libraries
  ESELECT_CORE_PATH="${ESELECT_DATA_PATH}/libs"
-@@ -64,12 +72,27 @@ fi
+@@ -66,12 +74,27 @@ fi
  # Load core functions
  source "${ESELECT_CORE_PATH}/core.bash" || exit 255
  # Load necessary functions for the main script
@@ -75,7 +75,7 @@ index 934a10a..5242ed3 100755
  # es_do_usage
  # Display eselect usage
  es_do_usage() {
-@@ -81,14 +104,10 @@ es_do_usage() {
+@@ -83,14 +106,10 @@ es_do_usage() {
  es_do_help() {
  	es_do_usage
  	echo
@@ -92,7 +92,7 @@ index 934a10a..5242ed3 100755
  }
  
  # es_do_version
-@@ -100,6 +119,114 @@ es_do_version() {
+@@ -102,6 +121,114 @@ es_do_version() {
  	echo "Distributed under the terms of the GNU GPL version 2 or later."
  }
  
@@ -207,7 +207,7 @@ index 934a10a..5242ed3 100755
  ### main code ###
  
  # figure out what the action is. we need to know whether we're
-@@ -141,6 +268,9 @@ while [[ ${1##--} != "$1" ]]; do
+@@ -143,6 +270,9 @@ while [[ ${1##--} != "$1" ]]; do
  				*) die -q "Invalid argument for ${1%%=*} option" ;;
  			esac
  			;;
@@ -218,7 +218,7 @@ index 934a10a..5242ed3 100755
  			[[ -z ${action} ]] || die -q "Too many parameters"
  			action=${1##--}
 diff --git a/libs/Makefile.am b/libs/Makefile.am
-index 027ef73..a5fe373 100644
+index 6ebd08e..c19f173 100644
 --- a/libs/Makefile.am
 +++ b/libs/Makefile.am
 @@ -1,6 +1,8 @@
@@ -239,22 +239,22 @@ index 027ef73..a5fe373 100644
  	config.bash.in \
  	core.bash.in \
  	default.eselect.in \
-@@ -30,7 +34,8 @@ dosed = @SED@ \
- 	-e 's%\@SED\@%@SED@%g' \
+@@ -31,7 +35,8 @@ dosed = @SED@ \
  	-e 's%\@PORTAGEQ\@%@PORTAGEQ@%g' \
  	-e 's%\@ENV_UPDATE\@%@ENV_UPDATE@%g' \
--	-e 's%\@CANONICALISE\@%@CANONICALISE@%g'
-+	-e 's%\@CANONICALISE\@%@CANONICALISE@%g' \
+ 	-e 's%\@CANONICALISE\@%@CANONICALISE@%g' \
+-	-e 's%\@libdir\@%@libdir@%g'
++	-e 's%\@libdir\@%@libdir@%g' \
 +	-e 's%\@sysconfdir\@%@sysconfdir@%g'
  
  %.bash : %.bash.in
  	@$(dosed) $< > $@
 diff --git a/libs/alternatives-common.bash.in b/libs/alternatives-common.bash.in
 new file mode 100644
-index 0000000..8753b89
+index 0000000..024d41e
 --- /dev/null
 +++ b/libs/alternatives-common.bash.in
-@@ -0,0 +1,510 @@
+@@ -0,0 +1,509 @@
 +# Copyright (c) 2005-2015 Gentoo Foundation
 +# Copyright (c) 2008 Mike Kelly
 +# Copyright (c) 2009-2013 David Leverton
@@ -277,8 +277,7 @@ index 0000000..8753b89
 +inherit config output path-manipulation tests
 +
 +: "${ALTERNATIVESDIR_ROOTLESS:=@sysconfdir@/env.d/alternatives}"
-+: "${ALTERNATIVESDIR_ROOT:=${ROOT%/}}"
-+ALTERNATIVESDIR="${ALTERNATIVESDIR_ROOT}${ALTERNATIVESDIR_ROOTLESS}"
++ALTERNATIVESDIR="${EROOT%/}${ALTERNATIVESDIR_ROOTLESS}"
 +
 +get_current_provider() {
 +	local dieprefix="Could not determine current provider for ${ALTERNATIVE}"
@@ -468,7 +467,7 @@ index 0000000..8753b89
 +				old_i+=1
 +
 +			else
-+				local target=${ALTERNATIVESDIR_ROOTLESS#${EPREFIX}/}/${ALTERNATIVE}/_current${newsymlinks[new_i]} dir=${newsymlinks[new_i]%/*}
++				local target=${ALTERNATIVESDIR_ROOTLESS#/}/${ALTERNATIVE}/_current${newsymlinks[new_i]} dir=${newsymlinks[new_i]%/*}
 +				while [[ -n ${dir} ]]; do
 +					target=../${target}
 +					dir=${dir%/*}
@@ -547,7 +546,7 @@ index 0000000..8753b89
 +	elif [[ ! -d "${provider_dir}" ]]; then
 +		die "${provider_dir} exists but is a file"
 +	else
-+		die "${provider_dir} already present. You need to remove it before adding it again"
++		die "${provider_dir} already present. You need ot remove it before adding it again"
 +	fi
 +
 +	# Make sure importance is a signed integer
@@ -564,7 +563,7 @@ index 0000000..8753b89
 +		if [[ ${src} != /* ]]; then
 +			die "Source path must be absolute, but got ${src}"
 +		else
-+			local reltarget= dir=${provider_dir#${ALTERNATIVESDIR_ROOT}${EPREFIX}}${src%/*}
++			local reltarget= dir=${provider_dir}${src%/*}
 +			while [[ -n ${dir} ]]; do
 +				reltarget+=../
 +				dir=${dir%/*}
@@ -1284,11 +1283,11 @@ index 0000000..840b9c5
 +	alternatives_options_remove
 +}
 diff --git a/modules/modules.eselect b/modules/modules.eselect
-index 038f630..78dcbab 100644
+index 5bc78ca..23c1e59 100644
 --- a/modules/modules.eselect
 +++ b/modules/modules.eselect
 @@ -2,7 +2,7 @@
- # Copyright 2006-2015 Gentoo Foundation
+ # Copyright 2006-2018 Gentoo Foundation
  # Distributed under the terms of the GNU GPL version 2 or later
  
 -inherit config


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/sci:master commit in: app-admin/eselect/files/
@ 2018-06-21 18:27 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2018-06-21 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     9e088d37a7bff06c0aededc98439456de3193659
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 18:20:06 2018 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 18:26:56 2018 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=9e088d37

app-admin/eselect: Fix eselect patch

Fixes #870

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../files/eselect-1.4.13-alternatives.patch        | 203 ++++++++++-----------
 1 file changed, 101 insertions(+), 102 deletions(-)

diff --git a/app-admin/eselect/files/eselect-1.4.13-alternatives.patch b/app-admin/eselect/files/eselect-1.4.13-alternatives.patch
index 0dbc50ef7..c47887fe6 100644
--- a/app-admin/eselect/files/eselect-1.4.13-alternatives.patch
+++ b/app-admin/eselect/files/eselect-1.4.13-alternatives.patch
@@ -5,11 +5,8 @@
  libs/alternatives.bash.in        | 316 ++++++++++++++++++++++++
  modules/Makefile.am              |   1 +
  modules/alternatives.eselect     | 178 ++++++++++++++
- modules/modules.eselect          | 282 ++++++++++++++--------
- 8 files changed, 1340 insertions(+), 105 deletions(-)
- create mode 100644 libs/alternatives-common.bash.in
- create mode 100644 libs/alternatives.bash.in
- create mode 100644 modules/alternatives.eselect
+ modules/modules.eselect          | 288 ++++++++++++++--------
+ 8 files changed, 1343 insertions(+), 108 deletions(-)
 
 diff --git a/bin/Makefile.am b/bin/Makefile.am
 index 20902c1..ad08867 100644
@@ -254,7 +251,7 @@ index 6ebd08e..c19f173 100644
  	@$(dosed) $< > $@
 diff --git a/libs/alternatives-common.bash.in b/libs/alternatives-common.bash.in
 new file mode 100644
-index 0000000..79b6eb5
+index 0000000..8753b89
 --- /dev/null
 +++ b/libs/alternatives-common.bash.in
 @@ -0,0 +1,510 @@
@@ -280,7 +277,7 @@ index 0000000..79b6eb5
 +inherit config output path-manipulation tests
 +
 +: "${ALTERNATIVESDIR_ROOTLESS:=@sysconfdir@/env.d/alternatives}"
-+: "${ALTERNATIVESDIR_ROOT:=${EROOT%/}}"
++: "${ALTERNATIVESDIR_ROOT:=${ROOT%/}}"
 +ALTERNATIVESDIR="${ALTERNATIVESDIR_ROOT}${ALTERNATIVESDIR_ROOTLESS}"
 +
 +get_current_provider() {
@@ -550,7 +547,7 @@ index 0000000..79b6eb5
 +	elif [[ ! -d "${provider_dir}" ]]; then
 +		die "${provider_dir} exists but is a file"
 +	else
-+		die "${provider_dir} already present. You need ot remove it before adding it again"
++		die "${provider_dir} already present. You need to remove it before adding it again"
 +	fi
 +
 +	# Make sure importance is a signed integer
@@ -1311,47 +1308,7 @@ index 5bc78ca..23c1e59 100644
  do_list() {
 -	local only_names path file module name desc
 -	local -a extra_modules
-+    local path file module name desc group groups Extra_modules
-+
-+    write_list_start "Built-in modules:"
-+    write_kv_list_entry "help"          "Display a help message"
-+    write_kv_list_entry "usage"         "Display a usage message"
-+    write_kv_list_entry "version"       "Display version information"
-+    write_kv_list_entry "print-modules" "Print eselect modules"
-+    write_kv_list_entry "print-actions" "Print actions for a given module"
-+    write_kv_list_entry "print-options" "Print options for a given action"
-+
-+    for path in "${ESELECT_MODULES_PATH[@]}" ; do
-+        [[ -d ${path} ]] || continue
-+        for file in ${path}/*.eselect ; do
-+            [[ -f ${file} ]] || continue
-+            group=$(load_config "${file}" ESELECT_MODULE_GROUP)
-+            if [[ -n ${group} ]]; then
-+                has ${group} ${groups} || groups+=" ${group}"
-+                declare ${group}_modules+=" ${file}"
-+            else
-+                Extra_modules+=" ${file}"
-+            fi
-+        done
-+    done
-+
-+    for group in ${groups} Extra; do
-+        local m
-+        m="${group}_modules"
-+        if [[ -n ${!m} ]] ; then
-+            echo
-+            write_list_start "${group} modules:"
-+            for module in ${!m}; do
-+                name=${module##*/}
-+                name=${name%%.eselect}
-+                desc=$(load_config "${module}" DESCRIPTION)
-+                desc=${desc:-No description available}
-+                write_kv_list_entry "${name}" "${desc}"
-+            done
-+        fi
-+    done
-+}
- 
+-
 -	if [[ ${1#--} = only-names ]]; then
 -		only_names=1
 -		shift
@@ -1365,8 +1322,7 @@ index 5bc78ca..23c1e59 100644
 -			extra_modules=( "${extra_modules[@]}" "${file}" )
 -		done
 -	done
-+### group action
- 
+-
 -	if [[ -n ${only_names} ]]; then
 -		# This is mainly intended for bash completion
 -		echo "help"
@@ -1395,6 +1351,49 @@ index 5bc78ca..23c1e59 100644
 -			done
 -		fi
 -	fi
++    local path file module name desc group groups Extra_modules
++
++    write_list_start "Built-in modules:"
++    write_kv_list_entry "help"          "Display a help message"
++    write_kv_list_entry "usage"         "Display a usage message"
++    write_kv_list_entry "version"       "Display version information"
++    write_kv_list_entry "print-modules" "Print eselect modules"
++    write_kv_list_entry "print-actions" "Print actions for a given module"
++    write_kv_list_entry "print-options" "Print options for a given action"
++
++    for path in "${ESELECT_MODULES_PATH[@]}" ; do
++        [[ -d ${path} ]] || continue
++        for file in ${path}/*.eselect ; do
++            [[ -f ${file} ]] || continue
++            group=$(load_config "${file}" ESELECT_MODULE_GROUP)
++            if [[ -n ${group} ]]; then
++                has ${group} ${groups} || groups+=" ${group}"
++                declare ${group}_modules+=" ${file}"
++            else
++                Extra_modules+=" ${file}"
++            fi
++        done
++    done
++
++    for group in ${groups} Extra; do
++        local m
++        m="${group}_modules"
++        if [[ -n ${!m} ]] ; then
++            echo
++            write_list_start "${group} modules:"
++            for module in ${!m}; do
++                name=${module##*/}
++                name=${name%%.eselect}
++                desc=$(load_config "${module}" DESCRIPTION)
++                desc=${desc:-No description available}
++                write_kv_list_entry "${name}" "${desc}"
++            done
++        fi
++    done
++}
++
++### group action
++
 +describe_group() {
 +    echo "Lists all available modules belonging to a specified group."
 +}
@@ -1452,6 +1451,12 @@ index 5bc78ca..23c1e59 100644
  do_has() {
 -	[[ -z $1 ]] && die -q "Required option (module name) missing"
 -	[[ $# -gt 1 ]] && die -q "Too many parameters"
+-
+-	local modname=$1 modpath
+-	for modpath in "${ESELECT_MODULES_PATH[@]}" ; do
+-		[[ -f ${modpath}/${modname}.eselect ]] && return 0
+-	done
+-	return 1
 +    [[ -z $1 ]] && die -q "Required option (module name) missing"
 +    [[ $# -gt 1 ]] && die -q "Too many parameters"
 +    local modname="$1" modpath
@@ -1460,17 +1465,52 @@ index 5bc78ca..23c1e59 100644
 +        [[ -f "${modpath}/${modname}.eselect" ]] && return 0
 +    done
 +    return 1
-+}
-+
-+### add action
+ }
+ 
+ ### add action
+-# *** Commented out. Do we really want to have an eselect module that is
+-# *** installing other modules in a system directory? Also, this should
+-# *** go together with a "remove" action.
+-
+-# describe_add() {
+-# 	echo "Install the given module file somewhere that eselect can find it."
+-# 	echo "By default, install to \$HOME/.eselect/modules/, unless running as "
+-# 	echo "root. Then, install to ${ESELECT_DATA_PATH}/modules/."
+-# }
+-
+-# describe_add_parameters() {
+-# 	echo "<module_file>"
+-# }
+-
+-# do_add() {
+-# 	local local_path="${ROOT}${HOME}/.eselect/modules/" module_file
+-# 	local force_default=0
+-#
+-# 	if [[ $1 = "--force-default-location" ]] ; then
+-# 		force_default=1
+-# 		shift
+-# 	fi
+-# 	module_file=$1
+-#
+-# 	[[ -z ${module_file} ]] && die -q "Required option (module file) missing"
+-#
+-# 	# TODO: Don't install the module "somewhere", depending on write access.
+-# 	# Add an option to control if it goes to the user's or to the system dir.
+-# 	if ! cp "${module_file}" "${ESELECT_DEFAULT_MODULES_PATH}" &> /dev/null ; then
+-# 		[[ ${force_default} == 1 ]] \
+-# 			&& die -q "Failed to install module file to default modules path"
+-#
+-# 		mkdir -p "${local_path}" \
+-# 			|| die -q "Failed to create module install directory"
+-# 		cp "${module_file}" "${local_path}" \
+-# 			|| die -q "Failed to install module file"
+-# 	fi
+-# }
 +
 +describe_add() {
 +    echo "Install a module file"
 +}
- 
--	local modname=$1 modpath
--	for modpath in "${ESELECT_MODULES_PATH[@]}" ; do
--		[[ -f ${modpath}/${modname}.eselect ]] && return 0
++
 +describe_add_options() {
 +    echo "--default : install as global module (default if root)"
 +    echo "--user : install as user's module"
@@ -1555,50 +1595,9 @@ index 5bc78ca..23c1e59 100644
 +	for module_path in "${ESELECT_MODULES_PATH[@]}" ; do
 +	    rm "${module_path}/${module_name}.eselect" &> /dev/null
 +	    ret=$?
- 	done
--	return 1
++	done
 +    fi
 +    [[ ${ret} != 0 ]] && die -q "Failed to remove module ${module_name}"
- }
- 
--### add action
--# *** Commented out. Do we really want to have an eselect module that is
--# *** installing other modules in a system directory? Also, this should
--# *** go together with a "remove" action.
--
--# describe_add() {
--# 	echo "Install the given module file somewhere that eselect can find it."
--# 	echo "By default, install to \$HOME/.eselect/modules/, unless running as "
--# 	echo "root. Then, install to ${ESELECT_DATA_PATH}/modules/."
--# }
--
--# describe_add_parameters() {
--# 	echo "<module_file>"
--# }
--
--# do_add() {
--# 	local local_path="${ROOT}${HOME}/.eselect/modules/" module_file
--# 	local force_default=0
--#
--# 	if [[ $1 = "--force-default-location" ]] ; then
--# 		force_default=1
--# 		shift
--# 	fi
--# 	module_file=$1
--#
--# 	[[ -z ${module_file} ]] && die -q "Required option (module file) missing"
--#
--# 	# TODO: Don't install the module "somewhere", depending on write access.
--# 	# Add an option to control if it goes to the user's or to the system dir.
--# 	if ! cp "${module_file}" "${ESELECT_DEFAULT_MODULES_PATH}" &> /dev/null ; then
--# 		[[ ${force_default} == 1 ]] \
--# 			&& die -q "Failed to install module file to default modules path"
--#
--# 		mkdir -p "${local_path}" \
--# 			|| die -q "Failed to create module install directory"
--# 		cp "${module_file}" "${local_path}" \
--# 			|| die -q "Failed to install module file"
--# 	fi
--# }
++}
++
 +# vim: set ft=eselect sw=4 sts=4 ts=4 et tw=80 :
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2018-06-21 18:27 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-21 18:27 [gentoo-commits] proj/sci:master commit in: app-admin/eselect/files/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2018-06-09 20:34 Justin Lecher
2015-12-21 10:38 Justin Lecher
2013-02-15 15:53 Justin Lecher
2012-02-09  0:09 Sebastien Fabbro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox