Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 147857
Collapse All | Expand All

(-)file_not_specified_in_diff (-9 / +8 lines)
Line  Link Here
0
-- vi.eselect
0
++ vi.eselect
Lines 46-60 Link Here
46
			die "Couldn't set ${target} /usr/bin/vi symlink"
46
			die "Couldn't set ${target} /usr/bin/vi symlink"
47
		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/ex" || \
47
		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/ex" || \
48
			die "Couldn't set ${target} /usr/bin/ex symlink"
48
			die "Couldn't set ${target} /usr/bin/ex symlink"
49
		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/vi" || \
49
		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/view" || \
50
			die "Couldn't set ${target} /usr/bin/vi symlink"
50
			die "Couldn't set ${target} /usr/bin/view symlink"
51
		ln -s "${ROOT}/usr/share/man/man1/${target}.1.gz" \
51
		ln -s "${ROOT}/usr/share/man/man1/${target}.1.gz" \
52
			"${ROOT}/usr/share/man/man1/vi.1.gz" || \
52
			"${ROOT}/usr/share/man/man1/vi.1.gz" || \
53
			die "Couldn't set ${target} /usr/share/man/man1/vi.1.gz symlink"
53
			die "Couldn't set ${target} /usr/share/man/man1/vi.1.gz symlink"
54
		ln -s "${ROOT}/usr/share/man/man1/${target}.1.gz"
54
		ln -s "${ROOT}/usr/share/man/man1/${target}.1.gz" \
55
			"${ROOT}/usr/share/man/man1/ex.1.gz" || \
55
			"${ROOT}/usr/share/man/man1/ex.1.gz" || \
56
			die "Couldn't set ${target} /usr/share/man/man1/ex.1.gz symlink"
56
			die "Couldn't set ${target} /usr/share/man/man1/ex.1.gz symlink"
57
		ln -s "${ROOT}/usr/share/man/man1/${target}.1.gz"
57
		ln -s "${ROOT}/usr/share/man/man1/${target}.1.gz" \
58
			"${ROOT}/usr/share/man/man1/view.1.gz" || \
58
			"${ROOT}/usr/share/man/man1/view.1.gz" || \
59
			die "Couldn't set ${target} /usr/share/man/man1/view.1.gz symlink"
59
			die "Couldn't set ${target} /usr/share/man/man1/view.1.gz symlink"
60
	else
60
	else
Lines 126-134 Link Here
126
		die -q "Too many parameters"
126
		die -q "Too many parameters"
127
127
128
	elif [[ -L "${ROOT}/usr/bin/vi" ]] ; then
128
	elif [[ -L "${ROOT}/usr/bin/vi" ]] ; then
129
		if ! remove_symlinks ; then
129
		remove_symlinks
130
			die -q "Can't remove existing provider"
131
		elif ! set_symlinks "${1}" ; then
130
		if ! set_symlinks "${1}" ; then
132
			die -q "Can't set new provider"
131
			die -q "Can't set new provider"
133
		fi
132
		fi
134
133
Lines 156-162 Link Here
156
155
157
	if [[ -L "${ROOT}/usr/bin/vi" ]] ; then
156
	if [[ -L "${ROOT}/usr/bin/vi" ]] ; then
158
		[[ ${1} == "--if-unset" ]] && return
157
		[[ ${1} == "--if-unset" ]] && return
159
		remove_symlinks || die -q "Can't remove existing link"
158
		remove_symlinks
160
	fi
159
	fi
161
	if [[ -e "${ROOT}/usr/bin/vi" ]] ; then
160
	if [[ -e "${ROOT}/usr/bin/vi" ]] ; then
162
		die -q "Can't set a new provider"
161
		die -q "Can't set a new provider"

Return to bug 147857