Attachment #708648 for bug #790305

View | Details | Raw Unified | Return to bug 790305
Collapse All | Expand All

Lines 75-81 then `/etc/env.d/rust/provider-TARGET` should contain: Link Here

(-)a/README.md (-4 lines)
75	```	75	```
76		76
77	Note, that `/usr/bin/rustc` should not be listed, as it is always managed by eselect.	77	Note, that `/usr/bin/rustc` should not be listed, as it is always managed by eselect.
78
79	### Notes
80
81	eselect-rust automatically prepends every path with `${EROOT}` variable.




# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

DESCRIPTION="Manage the Rust compiler versions"


	remove_symlink "${dest}"

	if [[ -e ${dest%/*}/${source} ]]; then
		mkdir -p "$(dirname ${dest})" || die -q "directory creation failed for $(dirname ${dest})"
		ln -s "${source}" "${dest}" || die -q "${dest} symlink setting failed"
	else


	unset_version

	set_symlink "rustc-${target_postfix}" "${BIN_DIR}/rustc"

	local symlinks=( $(get_symlinks ${target}) )
	for i in "${symlinks[@]}"; do
		set_symlink "${i##*/}-${target_postfix}" "${EROOT%/}${i}"
	done

	cp "${ENV_D_PATH}/rust/provider-${target}" \
- 

Return to bug 790305

Lines 1-4 Link Here

(-)a/rust.eselect.in (-5 / +4 lines)
1	# Copyright 1999-2020 Gentoo Authors	1	# Copyright 1999-2021 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	DESCRIPTION="Manage the Rust compiler versions"	4	DESCRIPTION="Manage the Rust compiler versions"
Lines 157-163 set_symlink() { Link Here
157		157
158	remove_symlink "${dest}"	158	remove_symlink "${dest}"
159		159
160	if [[ -e ${source} ]]; then	160	if [[ -e ${dest%/*}/${source} ]]; then
161	mkdir -p "$(dirname ${dest})" \|\| die -q "directory creation failed for $(dirname ${dest})"	161	mkdir -p "$(dirname ${dest})" \|\| die -q "directory creation failed for $(dirname ${dest})"
162	ln -s "${source}" "${dest}" \|\| die -q "${dest} symlink setting failed"	162	ln -s "${source}" "${dest}" \|\| die -q "${dest} symlink setting failed"
163	else	163	else
Lines 197-207 set_version() { Link Here
197		197
198	unset_version	198	unset_version
199		199
200	set_symlink "${BIN_DIR}/rustc-${target_postfix}" "${BIN_DIR}/rustc"	200	set_symlink "rustc-${target_postfix}" "${BIN_DIR}/rustc"
201		201
202	local symlinks=( $(get_symlinks ${target}) )	202	local symlinks=( $(get_symlinks ${target}) )
203	for i in "${symlinks[@]}"; do	203	for i in "${symlinks[@]}"; do
204	set_symlink "${EROOT%/}${i}-${target_postfix}" "${EROOT%/}${i}"	204	set_symlink "${i##*/}-${target_postfix}" "${EROOT%/}${i}"
205	done	205	done
206		206
207	cp "${ENV_D_PATH}/rust/provider-${target}" \	207	cp "${ENV_D_PATH}/rust/provider-${target}" \
208	-