summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--completions/emerge24
-rw-r--r--helpers/gentoo-common.sh10
2 files changed, 24 insertions, 10 deletions
diff --git a/completions/emerge b/completions/emerge
index e84a7fc..98110c4 100644
--- a/completions/emerge
+++ b/completions/emerge
@@ -93,11 +93,25 @@ _emerge()
elif [[ ${cur} == --* ]]; then
# Complete on long options.
opts="--alphabetical \
- --ask --autounmask-write \
+ --ask \
+ --autounmask-write --autounmask-keep-keywords --autounmask-continue \
+ --autounmask-backtrack --autounmask-only --autounmask-unrestricted-atoms \
+ --autounmask-keep-masks --autounmask-license --autounmask-use \
+ --accept-properties --accept-restrict --alert --alert=y --alert=n \
+ --ask-enter-invalid \
+ --binpkg-changed-deps --binpkg-respect-use \
+ --buildpkg-exclude \
--buildpkg --buildpkgonly \
+ --backtrack= \
--changelog --clean --color=y --color=n --columns --complete-graph --config \
+ --complete-graph-if-new-use --complete-graph-if-new-ver \
+ --config-root \
+ --changed-deps --changed-deps-report --changed-slot --changed-use \
--debug --deep --depclean --deselect \
+ --depclean-lib-check \
+ --dynamic-deps --dynamic-deps=y --dynamic-deps=n \
--emptytree \
+ --exclude \
--fetch-all-uri --fetchonly \
--getbinpkg --getbinpkgonly \
--ignore-default-opts --info \
@@ -105,16 +119,16 @@ _emerge()
--keep-going \
--metadata \
--newuse --noconfmem --nodeps --noreplace --nospinner \
- --oneshot --onlydeps \
+ --oneshot --onlydeps --onlydeps-with-ideps --onlydeps-with-rdeps \
--pretend --prune \
--quiet --rage-clean \
--reinstall=changed-use --regen \
--search \
--sync \
--tree \
- --unmerge --update --upgradeonly --usepkg --usepkgonly \
- --verbose \
- --with-bdeps=y --with-bdeps=n"
+ --unmerge --update --update-if-installed --upgradeonly --usepkg --usepkgonly \
+ --verbose --verbose-conflicts \
+ --with-bdeps=y --with-bdeps=n --with-test-deps"
if [[ ${curword} -eq 1 ]] && [[ ${numwords} -eq 2 ]] ; then
opts="${opts} --help --resume --searchdesc --version"
fi
diff --git a/helpers/gentoo-common.sh b/helpers/gentoo-common.sh
index 35b5946..f587be2 100644
--- a/helpers/gentoo-common.sh
+++ b/helpers/gentoo-common.sh
@@ -18,7 +18,7 @@
# for PORTDIR and PORTDIR_OVERLAY. While repos.conf overrides any value of
# PORTDIR set in make.conf, PORTDIR_OVERLAY is incremental (combined across
# available sources).
-#
+#
# This would be a hell of a lot simpler if we used portageq, but also about
# 500 times slower.
_portdir() {
@@ -32,7 +32,7 @@ _portdir() {
source @GENTOO_PORTAGE_EPREFIX@/etc/make.conf 2>/dev/null
source @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf 2>/dev/null
-
+
overlaypath+=(${PORTDIR_OVERLAY})
# strip out duplicates
@@ -52,9 +52,9 @@ _portdir() {
echo "${PORTDIR}"
- if [[ ${1} == -o ]]; then
+ if [[ ${1} == -o ]]; then
echo "${PORTDIR_OVERLAY}"
- fi
+ fi
fi
}
@@ -69,7 +69,7 @@ _parsereposconf() {
[[ -f ${f} ]] || continue
insection=0
-
+
while read -r line; do
# skip comments and blank lines
[[ -z ${line} || ${line} == '#'* ]] && continue