From d44e3b19ecbf6cf81cbfc0284d84f4e11b1cbdc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 2 Jul 2017 21:47:48 +0200 Subject: app-shells/bash-completion: Drop redundant versions --- app-shells/bash-completion/Manifest | 4 - .../bash-completion-2.1_p20141224-r1.ebuild | 94 ---------------- .../bash-completion/bash-completion-2.3-r2.ebuild | 101 ----------------- .../bash-completion/bash-completion-2.4.ebuild | 98 ----------------- .../bash-completion/bash-completion-2.6.ebuild | 122 --------------------- .../bash-completion-2.1-escape-characters.patch | 27 ----- 6 files changed, 446 deletions(-) delete mode 100644 app-shells/bash-completion/bash-completion-2.1_p20141224-r1.ebuild delete mode 100644 app-shells/bash-completion/bash-completion-2.3-r2.ebuild delete mode 100644 app-shells/bash-completion/bash-completion-2.4.ebuild delete mode 100644 app-shells/bash-completion/bash-completion-2.6.ebuild delete mode 100644 app-shells/bash-completion/files/bash-completion-2.1-escape-characters.patch (limited to 'app-shells/bash-completion') diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest index 7bdf712fcbe..b4c367c912b 100644 --- a/app-shells/bash-completion/Manifest +++ b/app-shells/bash-completion/Manifest @@ -1,8 +1,4 @@ -DIST bash-completion-2.1_p20141224.tar.xz 257964 SHA256 a76ffdbc9f49f48e290f0e6f3d46060d51c770f91e25b35b014bc16fec76f517 SHA512 94649aad8dbf0f170422605a5f36c5cab61e45ce402a92f89a6eba3bd5d2e976087b35cd0a9b6d4d29ba608cee3bb27b692088c884b766447ee9eafa99c2814a WHIRLPOOL 0ea12dfc8f432ffed598aee65c7080de570ebe9783415c7ebe4bd5d152fc645a132fae3a28986c029d13a4b939e15053204d73ae9b207f4ad62b9c117bf59cba -DIST bash-completion-2.3.tar.xz 272252 SHA256 b2e081af317f3da4fff3a332bfdbebeb5514ebc6c2d2a9cf781180acab15e8e9 SHA512 396c060fa39aa05866d26b573d6b9eebdb96e41a17ef723e95f8b01bbda32b0b83bf9e4d978a4f0a1c0590787ae797bb3b6417b95b877f8447037cb873ccf38a WHIRLPOOL fe5ebae1c77dfba504e8f79b130ba0bc80d882a045b980a23f4642e77dfb7bb79b529c1573b13fc0986f486c41696bb94fadef677e0cabfdffe7aeea6e8ff5c0 DIST bash-completion-2.4.tar.xz 276148 SHA256 c0f76b5202fec9ef8ffba82f5605025ca003f27cfd7a85115f838ba5136890f6 SHA512 b852e0a38417dfc3754a91dae2d107f99a3c2970d835a4bbaa80f2a4db8d670bc3820ddc6ada26f68070f22fb4c1db7abe50ad489b1c0f8497b1e6e91be27627 WHIRLPOOL f38f148dcbca1ee47ec6fa33637ea0673c03816b607bd638605832fb76ec7fb5f24cba35cb559e8a5b06636b1ec0f225e420615b6721074fc405cb79b505b07b DIST bash-completion-2.5.tar.xz 276732 SHA256 b0b9540c65532825eca030f1241731383f89b2b65e80f3492c5dd2f0438c95cf SHA512 44ca2cbf38190c2bfa1e98021c1de36dbef0e55f9fe7840e83bd7f91b4c9afc92afa9bb03d53dbc6d9f9b468ac63ff1021a60e456fc239010010d75687eff3da WHIRLPOOL b488571aca9d8b027214c2964ec789ef616659a098a2bd65a921075d94a8014b51a802040535e44c7831b159a5094b6879935f726ee97409b575c36cd01dbc13 -DIST bash-completion-2.6.tar.xz 279932 SHA256 61fb652da0b1674443c34827263fe2335f9ddb12670bff208fc383a8955ca5ef SHA512 d2eb69595c297fda7e12d645f4b84d419769408d2e4b999cc867b469c8297941c491352bb9096f21fe3502ba03761450629b4dc9fdf451d90fa37c1fa244ab67 WHIRLPOOL b61b4bb0a4685c7166f2836c6ad62ae33d24cbd7018712d35ae47fda34db9f14f8ae7bb0380ff44222eb8c00cbf83138d5088ef465ebdb9d1ff10944653660ec DIST bash-completion-2.7.tar.xz 280048 SHA256 41ba892d3f427d4a686de32673f35401bc947a7801f684127120cdb13641441e SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd WHIRLPOOL 9f5b2a4af13428a89be8c692cd4bbc38b107045d0c60ee1efe440cf7bfdc5db95f564024373442c32ad1ecfabc22346caee0f4597d71baa4ef7a28dd248c4c27 -DIST bashcomp-2.0.1.tar.bz2 4078 SHA256 142348b61b32fb3f1580ac90b684b1014d6d177f371baadb503340c507f9a992 SHA512 8ac8982f418a2d71dffcf027ffe0b7eefa3ee49413a726a8ee9e758975d8f86c687a64b55cd94e09b7936d1c6990285ddc90a3c2b1989af44322937c5c4fb8d7 WHIRLPOOL b6daa0a93282e9df73635cbdddde97c473fd22aa3baf035c3ffcb5966152e20b26d85979fe8a5ecf9128157422f3f60dc27c82c843b9a0e6e80b7de7da596250 DIST bashcomp-2.0.2.tar.gz 3625 SHA256 6ede58bfbe99f0dca1eb9236492aa20a6755e5731526de56e15d1e2b220165c9 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce WHIRLPOOL 4b6cb989235d5fed8fd9986c1419ab337df38384fe2b307fd78f08f8696f4a2328845ed4f27913a36e9a544e973690bc0dd2af73816e272c3faf27ff2eafa585 diff --git a/app-shells/bash-completion/bash-completion-2.1_p20141224-r1.ebuild b/app-shells/bash-completion/bash-completion-2.1_p20141224-r1.ebuild deleted file mode 100644 index f6fab6beb51..00000000000 --- a/app-shells/bash-completion/bash-completion-2.1_p20141224-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -BASHCOMP_P=bashcomp-2.0.1 -inherit versionator - -DESCRIPTION="Programmable Completion for bash" -HOMEPAGE="http://bash-completion.alioth.debian.org/" -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz - https://dev.gentoo.org/~mgorny/dist/${BASHCOMP_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="" - -RDEPEND=">=app-shells/bash-4.3_p30-r1 - sys-apps/miscfiles - !app-eselect/eselect-bashcomp" -DEPEND="app-arch/xz-utils" -PDEPEND=">=app-shells/gentoo-bashcomp-20140911" - -# Remove unwanted completions. -STRIP_COMPLETIONS=( - # Slackware package stuff, quite generic names cause collisions - # (e.g. with sys-apps/pacman) - explodepkg installpkg makepkg pkgtool removepkg upgradepkg - - # Debian/Red Hat network stuff - ifdown ifup ifstatus - - # Installed in app-editors/vim-core - xxd - - # Now-dead symlinks to deprecated completions - hd ncal -) - -src_prepare() { - epatch "${WORKDIR}/${BASHCOMP_P}/${P}"-*.patch - # Bug 543100 - epatch "${FILESDIR}/${PN}-2.1-escape-characters.patch" -} - -src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 - -src_install() { - # work-around race conditions, bug #526996 - mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die - - emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install - - local file - for file in "${STRIP_COMPLETIONS[@]}"; do - rm "${ED}"/usr/share/bash-completion/completions/${file} || die - done - # remove deprecated completions (moved to other packages) - rm "${ED}"/usr/share/bash-completion/completions/_* || die - - dodoc AUTHORS CHANGES README - - # install the eselect module - insinto /usr/share/eselect/modules - doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" - doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.1-r90 ${v}; then - ewarn "For bash-completion autoloader to work, all completions need to" - ewarn "be installed in /usr/share/bash-completion/completions. You may" - ewarn "need to rebuild packages that installed completions in the old" - ewarn "location. You can do this using:" - ewarn - ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +" - ewarn - ewarn "After the rebuild, you should remove the old setup symlinks:" - ewarn - ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete" - fi - done - - if has_version 'app-shells/zsh'; then - elog - elog "If you are interested in using the provided bash completion functions with" - elog "zsh, valuable tips on the effective use of bashcompinit are available:" - elog " http://www.zsh.org/mla/workers/2003/msg00046.html" - elog - fi -} diff --git a/app-shells/bash-completion/bash-completion-2.3-r2.ebuild b/app-shells/bash-completion/bash-completion-2.3-r2.ebuild deleted file mode 100644 index 2087fda87c6..00000000000 --- a/app-shells/bash-completion/bash-completion-2.3-r2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -BASHCOMP_P=bashcomp-2.0.2 -inherit versionator - -DESCRIPTION="Programmable Completion for bash" -HOMEPAGE="https://github.com/scop/bash-completion" -SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz - https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="" - -RDEPEND=">=app-shells/bash-4.3_p30-r1 - sys-apps/miscfiles - !app-eselect/eselect-bashcomp" -DEPEND="app-arch/xz-utils" -PDEPEND=">=app-shells/gentoo-bashcomp-20140911" - -# Remove unwanted completions. -STRIP_COMPLETIONS=( - # Slackware package stuff, quite generic names cause collisions - # (e.g. with sys-apps/pacman) - explodepkg installpkg makepkg pkgtool removepkg upgradepkg - - # Debian/Red Hat network stuff - ifdown ifup ifstatus - - # Installed in app-editors/vim-core - xxd - - # Now-dead symlinks to deprecated completions - hd ncal - - # Installed by sys-apps/util-linux-2.28 - mount umount mount.linux umount.linux - - # Dumb symlink to mplayer, removed upstream in git - mpv -) - -src_prepare() { - eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch - # Bug 543100 - eapply "${FILESDIR}/${PN}-2.1-escape-characters.patch" - eapply_user -} - -src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 - -src_install() { - # work-around race conditions, bug #526996 - mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die - - emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install - - local file - for file in "${STRIP_COMPLETIONS[@]}"; do - rm "${ED}"/usr/share/bash-completion/completions/${file} || die - done - # remove deprecated completions (moved to other packages) - rm "${ED}"/usr/share/bash-completion/completions/_* || die - - dodoc AUTHORS CHANGES CONTRIBUTING.md README.md - - # install the eselect module - insinto /usr/share/eselect/modules - doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" - doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.1-r90 ${v}; then - ewarn "For bash-completion autoloader to work, all completions need to" - ewarn "be installed in /usr/share/bash-completion/completions. You may" - ewarn "need to rebuild packages that installed completions in the old" - ewarn "location. You can do this using:" - ewarn - ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +" - ewarn - ewarn "After the rebuild, you should remove the old setup symlinks:" - ewarn - ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete" - fi - done - - if has_version 'app-shells/zsh'; then - elog - elog "If you are interested in using the provided bash completion functions with" - elog "zsh, valuable tips on the effective use of bashcompinit are available:" - elog " http://www.zsh.org/mla/workers/2003/msg00046.html" - elog - fi -} diff --git a/app-shells/bash-completion/bash-completion-2.4.ebuild b/app-shells/bash-completion/bash-completion-2.4.ebuild deleted file mode 100644 index 3464ccba3e7..00000000000 --- a/app-shells/bash-completion/bash-completion-2.4.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -BASHCOMP_P=bashcomp-2.0.2 -inherit versionator - -DESCRIPTION="Programmable Completion for bash" -HOMEPAGE="https://github.com/scop/bash-completion" -SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz - https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="" - -RDEPEND=">=app-shells/bash-4.3_p30-r1 - sys-apps/miscfiles - !app-eselect/eselect-bashcomp" -DEPEND="app-arch/xz-utils" -PDEPEND=">=app-shells/gentoo-bashcomp-20140911" - -# Remove unwanted completions. -STRIP_COMPLETIONS=( - # Slackware package stuff, quite generic names cause collisions - # (e.g. with sys-apps/pacman) - explodepkg installpkg makepkg pkgtool removepkg upgradepkg - - # Debian/Red Hat network stuff - ifdown ifup ifstatus - - # Installed in app-editors/vim-core - xxd - - # Now-dead symlinks to deprecated completions - hd ncal - - # Installed by sys-apps/util-linux-2.28 - mount umount mount.linux umount.linux -) - -src_prepare() { - eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch - # Bug 543100 - eapply "${FILESDIR}/${PN}-2.1-escape-characters.patch" - eapply_user -} - -src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 - -src_install() { - # work-around race conditions, bug #526996 - mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die - - emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install - - local file - for file in "${STRIP_COMPLETIONS[@]}"; do - rm "${ED}"/usr/share/bash-completion/completions/${file} || die - done - # remove deprecated completions (moved to other packages) - rm "${ED}"/usr/share/bash-completion/completions/_* || die - - dodoc AUTHORS CHANGES CONTRIBUTING.md README.md - - # install the eselect module - insinto /usr/share/eselect/modules - doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" - doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.1-r90 ${v}; then - ewarn "For bash-completion autoloader to work, all completions need to" - ewarn "be installed in /usr/share/bash-completion/completions. You may" - ewarn "need to rebuild packages that installed completions in the old" - ewarn "location. You can do this using:" - ewarn - ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +" - ewarn - ewarn "After the rebuild, you should remove the old setup symlinks:" - ewarn - ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete" - fi - done - - if has_version 'app-shells/zsh'; then - elog - elog "If you are interested in using the provided bash completion functions with" - elog "zsh, valuable tips on the effective use of bashcompinit are available:" - elog " http://www.zsh.org/mla/workers/2003/msg00046.html" - elog - fi -} diff --git a/app-shells/bash-completion/bash-completion-2.6.ebuild b/app-shells/bash-completion/bash-completion-2.6.ebuild deleted file mode 100644 index 99d53dd87c6..00000000000 --- a/app-shells/bash-completion/bash-completion-2.6.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -BASHCOMP_P=bashcomp-2.0.2 -inherit versionator - -DESCRIPTION="Programmable Completion for bash" -HOMEPAGE="https://github.com/scop/bash-completion" -SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz - https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="test" -# Multiple test failures, need to investigate the exact problem -RESTRICT="test" - -RDEPEND=">=app-shells/bash-4.3_p30-r1 - sys-apps/miscfiles - !app-eselect/eselect-bashcomp" -DEPEND="app-arch/xz-utils - test? ( - ${RDEPEND} - app-misc/dtach - dev-util/dejagnu - dev-tcltk/tcllib - )" -PDEPEND=">=app-shells/gentoo-bashcomp-20140911" - -# Remove unwanted completions. -STRIP_COMPLETIONS=( - # Slackware package stuff, quite generic names cause collisions - # (e.g. with sys-apps/pacman) - explodepkg installpkg makepkg pkgtool removepkg upgradepkg - - # Debian/Red Hat network stuff - ifdown ifup ifstatus - - # Installed in app-editors/vim-core - xxd - - # Now-dead symlinks to deprecated completions - hd ncal - - # Installed by sys-apps/util-linux-2.28 - mount umount mount.linux umount.linux -) - -src_prepare() { - eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch - # Bug 543100, update bug 601194 - eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch" - eapply_user -} - -src_test() { - # Tests need an interactive shell, #477066 - # idea stolen from: - # http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec - - # real-time output of the log ;-) - touch "${T}/dtach-test.log" || die - tail -f "${T}/dtach-test.log" & - local tail_pid=${!} - - nonfatal dtach -N "${T}/dtach.sock" \ - bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out' - - kill "${tail_pid}" - [[ -f ${T}/dtach-test.out ]] || die "Unable to run tests" - [[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed" -} - -src_install() { - # work-around race conditions, bug #526996 - mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die - - emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install - - local file - for file in "${STRIP_COMPLETIONS[@]}"; do - rm "${ED}"/usr/share/bash-completion/completions/${file} || die - done - # remove deprecated completions (moved to other packages) - rm "${ED}"/usr/share/bash-completion/completions/_* || die - - dodoc AUTHORS CHANGES CONTRIBUTING.md README.md - - # install the eselect module - insinto /usr/share/eselect/modules - doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" - doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.1-r90 ${v}; then - ewarn "For bash-completion autoloader to work, all completions need to" - ewarn "be installed in /usr/share/bash-completion/completions. You may" - ewarn "need to rebuild packages that installed completions in the old" - ewarn "location. You can do this using:" - ewarn - ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +" - ewarn - ewarn "After the rebuild, you should remove the old setup symlinks:" - ewarn - ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete" - fi - done - - if has_version 'app-shells/zsh'; then - elog - elog "If you are interested in using the provided bash completion functions with" - elog "zsh, valuable tips on the effective use of bashcompinit are available:" - elog " http://www.zsh.org/mla/workers/2003/msg00046.html" - elog - fi -} diff --git a/app-shells/bash-completion/files/bash-completion-2.1-escape-characters.patch b/app-shells/bash-completion/files/bash-completion-2.1-escape-characters.patch deleted file mode 100644 index 5e0de75982a..00000000000 --- a/app-shells/bash-completion/files/bash-completion-2.1-escape-characters.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- bash-completion-2.1/bash_completion.orig 2014-03-09 17:38:14 +0000 -+++ bash-completion-2.1/bash_completion 2014-03-13 23:26:44 +0000 -@@ -536,13 +536,23 @@ - # @param $2 Name of variable to return result to - _quote_readline_by_ref() - { -- if [[ $1 == \'* ]]; then -+ if [ -z "$1" ]; then -+ # avoid quoting if empty -+ printf -v $2 %s "$1" -+ elif [[ $1 == \'* ]]; then - # Leave out first character - printf -v $2 %s "${1:1}" -+ elif [[ $1 == ~* ]]; then -+ # avoid escaping first ~ -+ printf -v $2 ~%q "${1:1}" - else - printf -v $2 %q "$1" - fi - -+ # Replace double escaping ( \\ ) by single ( \ ) -+ # This happens always when argument is already escaped at cmdline, -+ # and passed to this function as e.g.: file\ with\ spaces -+ [[ ${!2} == *\\* ]] && printf -v $2 %s "${1//\\\\/\\}" - # If result becomes quoted like this: $'string', re-evaluate in order to - # drop the additional quoting. See also: http://www.mail-archive.com/ - # bash-completion-devel@lists.alioth.debian.org/msg01942.html -- cgit v1.2.1