commit: 911b8edaa0b019edb840a5c49a344ac638c86202 Author: Ben de Groot <yngwin <AT> gentoo <DOT> org> AuthorDate: Sat Nov 22 06:43:37 2014 +0000 Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org> CommitDate: Sat Nov 22 06:43:37 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=911b8eda
vi.eselect: apply patch from 1.1.7-r1 --- AUTHORS | 3 +++ ChangeLog | 4 ++++ modules/vi.eselect | 52 ++++++++++++++++++++++++++-------------------------- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/AUTHORS b/AUTHORS index fb58161..c1e3a1e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -30,3 +30,6 @@ Chí-Thanh Christopher Nguyễn <[email protected]> Christoph Junghans <[email protected]> Modules: awk, timezone + +Ben de Groot <[email protected]> + Modules: vi diff --git a/ChangeLog b/ChangeLog index 9c1945a..ebab7dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-11-22 Ben de Groot <[email protected]> + + * modules/vi.eselect: apply patch from 1.1.7-r1 + 2014-04-23 Christoph Junghans <[email protected]> * modules/wxwidgets.eselect: add prefix (mac) support (bug #508438) diff --git a/modules/vi.eselect b/modules/vi.eselect index 8fc600f..70ce1c8 100644 --- a/modules/vi.eselect +++ b/modules/vi.eselect @@ -11,13 +11,13 @@ VERSION=$(svn_date_to_version "${SVN_DATE}" ) find_targets() { local f for f in \ - "${ROOT}"/usr/bin/vim \ - "${ROOT}"/usr/bin/nvi \ - "${ROOT}"/usr/bin/elvis \ - "${ROOT}"/usr/bin/vile \ - "${ROOT}"/usr/bin/gvim \ - "${ROOT}"/usr/bin/xvile \ - "${ROOT}"/bin/busybox \ + "${EROOT}"/usr/bin/vim \ + "${EROOT}"/usr/bin/nvi \ + "${EROOT}"/usr/bin/elvis \ + "${EROOT}"/usr/bin/vile \ + "${EROOT}"/usr/bin/gvim \ + "${EROOT}"/usr/bin/xvile \ + "${EROOT}"/bin/busybox \ ; do if [[ -f "${f}" ]] ; then echo $(basename "${f}" ) @@ -27,8 +27,8 @@ find_targets() { # try to remove the vi, ex, view and man vi symlinks remove_symlinks() { - rm -f "${ROOT}"/usr/bin/{vi,ex,view} &>/dev/null && \ - rm -f "${ROOT}"/usr/share/man/man1/{vi,ex,view}.1{,.gz,.bz2,.lzma} &>/dev/null + rm -f "${EROOT}"/usr/bin/{vi,ex,view} &>/dev/null && \ + rm -f "${EROOT}"/usr/share/man/man1/{vi,ex,view}.1{,.gz,.bz2,.lzma} &>/dev/null } # set a man page symlink @@ -36,7 +36,7 @@ set_man_symlink() { local target="${1}" link_name="${2}" x extension for x in ".1" ".1.bz2" ".1.gz" ".1.lzma" ; do - if [[ -e /usr/share/man/man1/${target}${x} ]] ; then + if [[ -e ${EROOT}/usr/share/man/man1/${target}${x} ]] ; then extension="${x}" break fi @@ -48,7 +48,7 @@ set_man_symlink() { fi ln -s "${target}${extension}" \ - "${ROOT}/usr/share/man/man1/${link_name}${extension}" + "${EROOT}/usr/share/man/man1/${link_name}${extension}" } # set the vi, ex, view, and man vi symlinks @@ -61,9 +61,9 @@ set_symlinks() { local dir if [[ ${target} == "busybox" ]]; then - dir="${ROOT}/bin" + dir="${EROOT}/bin" else - dir="${ROOT}/usr/bin" + dir="${EROOT}/usr/bin" fi if [[ -f "${dir}/${target}" ]] ; then @@ -75,12 +75,12 @@ set_symlinks() { set_man_symlink "${target}" "view" # it's not okay if these fail - target=$(relative_name "${dir}/${target}" "${ROOT}/usr/bin") - ln -s "${target}" "${ROOT}/usr/bin/vi" \ + target=$(relative_name "${dir}/${target}" "${EROOT}/usr/bin") + ln -s "${target}" "${EROOT}/usr/bin/vi" \ || die "Couldn't set ${target} /usr/bin/vi symlink" - ln -s "${target}" "${ROOT}/usr/bin/ex" \ + ln -s "${target}" "${EROOT}/usr/bin/ex" \ || die "Couldn't set ${target} /usr/bin/ex symlink" - ln -s "${target}" "${ROOT}/usr/bin/view" \ + ln -s "${target}" "${EROOT}/usr/bin/view" \ || die "Couldn't set ${target} /usr/bin/view symlink" else die -q "Target \"${1}\" doesn't appear to be valid!" @@ -97,9 +97,9 @@ do_show() { [[ -z "${@}" ]] || die -q "Too many parameters" write_list_start "Current vi implementation:" - if [[ -L "${ROOT}/usr/bin/vi" ]] ; then - write_kv_list_entry "$(basename $(canonicalise ${ROOT}/usr/bin/vi ) )" "" - elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then + if [[ -L "${EROOT}/usr/bin/vi" ]] ; then + write_kv_list_entry "$(basename $(canonicalise ${EROOT}/usr/bin/vi ) )" "" + elif [[ -e "${EROOT}/usr/bin/vi" ]] ; then write_kv_list_entry "(not a symlink)" "" else write_kv_list_entry "(unset)" "" @@ -119,7 +119,7 @@ do_list() { targets=( $(find_targets ) ) for (( i = 0; i < ${#targets[@]}; i++ )); do [[ ${targets[i]} = \ - $(basename "$(canonicalise "${ROOT}/usr/bin/vi")") ]] \ + $(basename "$(canonicalise "${EROOT}/usr/bin/vi")") ]] \ && targets[i]=$(highlight_marker "${targets[i]}") done write_list_start "Available vi implementations:" @@ -147,15 +147,15 @@ do_set() { elif [[ -n "${2}" ]] ; then die -q "Too many parameters" - elif [[ -L "${ROOT}/usr/bin/vi" ]] ; then + elif [[ -L "${EROOT}/usr/bin/vi" ]] ; then if ! remove_symlinks ; then die -q "Can't remove existing provider" elif ! set_symlinks "${1}" ; then die -q "Can't set new provider" fi - elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then - die -q "Sorry, ${ROOT}/usr/bin/vi confuses me" + elif [[ -e "${EROOT}/usr/bin/vi" ]] ; then + die -q "Sorry, ${EROOT}/usr/bin/vi confuses me" else set_symlinks "${1}" || die -q "Can't set a new provider" @@ -176,11 +176,11 @@ do_update() { [[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \ die -q "Usage error" - if [[ -L "${ROOT}/usr/bin/vi" ]] ; then + if [[ -L "${EROOT}/usr/bin/vi" ]] ; then [[ ${1} == "--if-unset" ]] && return remove_symlinks || die -q "Can't remove existing link" fi - if [[ -e "${ROOT}/usr/bin/vi" ]] ; then + if [[ -e "${EROOT}/usr/bin/vi" ]] ; then die -q "Can't set a new provider" elif ! [[ -z $(find_targets ) ]] ; then set_symlinks 1 || die -q "Can't set a new provider"
