Kill the million duplicate aliases in rpmpopt

diff --git a/rpmpopt.in b/rpmpopt.in
index 5e26ca2..c822b38 100644 (file)
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -151,36 +151,6 @@ rpm        alias --httpport        --define '_httpport !#:+'
 rpm    alias --httpproxy       --define '_httpproxy !#:+'
 
 #==============================================================================
-# Popt glue to preserve legacy CLI behavior.
-#
-# XXX popt exec parsing doesn't honor POPT_ARGFLAG_ONEDASH
-rpm    exec --initdb           rpmd --initdb
-rpm    exec --rebuilddb        rpmd --rebuilddb
-rpm    exec --verifydb         rpmd --verifydb
-
-rpm    exec --addsign          rpmk --addsign
-rpm    exec -K                 rpmk -K
-rpm    exec --checksig         rpmk --checksig
-rpm    exec --import           rpmk --import
-rpm    exec --resign           rpmk --resign
-
-rpm    exec -q                 rpmq -q
-rpm    exec --query            rpmq --query
-rpm    exec --querytags        rpmq --querytags
-rpm    exec -V                 rpmv -V
-rpm    exec -y                 rpmv -y
-rpm    exec --verify           rpmv --verify
-
-#rpm   exec -i                 rpmi -i
-#rpm   exec --install          rpmi --install
-#rpm   exec -U                 rpmi -U
-#rpm   exec --upgrade          rpmi --upgrade
-#rpm   exec -F                 rpmi -F
-#rpm   exec --freshen          rpmi --freshen
-#rpm   exec -e                 rpmi -e
-#rpm   exec --erase            rpmi --erase
-
-#==============================================================================
 rpmbuild       alias --dbpath          --define '_dbpath !#:+' \
        --POPTdesc=$"use database in DIRECTORY" \
        --POPTargs=$"DIRECTORY"
@@ -195,263 +165,5 @@ rpmbuild alias --with             --define "_with_!#:+     --with-!#:+" \
 rpmbuild alias --without       --define "_without_!#:+  --without-!#:+" \
        --POPTdesc=$"disable configure <option> for build" \
        --POPTargs=$"<option>"
-#==============================================================================
-rpmd   alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use database in DIRECTORY" \
-       --POPTargs=$"DIRECTORY"
-rpmd   alias --ftpport         --define '_ftpport !#:+'
-rpmd   alias --ftpproxy        --define '_ftpproxy !#:+'
-rpmd   alias --httpport        --define '_httpport !#:+'
-rpmd   alias --httpproxy       --define '_httpproxy !#:+'
-#==============================================================================
-rpmdb  alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use database in DIRECTORY" \
-       --POPTargs=$"DIRECTORY"
-rpmdb  alias --ftpport         --define '_ftpport !#:+'
-rpmdb  alias --ftpproxy        --define '_ftpproxy !#:+'
-rpmdb  alias --httpport        --define '_httpport !#:+'
-rpmdb  alias --httpproxy       --define '_httpproxy !#:+'
-#==============================================================================
-rpme   alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use database in DIRECTORY" \
-       --POPTargs=$"DIRECTORY"
-rpme   alias --ftpport         --define '_ftpport !#:+'
-rpme   alias --ftpproxy        --define '_ftpproxy !#:+'
-rpme   alias --httpport        --define '_httpport !#:+'
-rpme   alias --httpproxy       --define '_httpproxy !#:+'
-#==============================================================================
-rpmi   alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use database in DIRECTORY" \
-       --POPTargs=$"DIRECTORY"
-rpmi   alias --ftpport         --define '_ftpport !#:+'
-rpmi   alias --ftpproxy        --define '_ftpproxy !#:+'
-rpmi   alias --httpport        --define '_httpport !#:+'
-rpmi   alias --httpproxy       --define '_httpproxy !#:+'
-#==============================================================================
-rpmk   alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use database in DIRECTORY" \
-       --POPTargs=$"DIRECTORY"
-rpmk   alias --ftpport         --define '_ftpport !#:+'
-rpmk   alias --ftpproxy        --define '_ftpproxy !#:+'
-rpmk   alias --httpport        --define '_httpport !#:+'
-rpmk   alias --httpproxy       --define '_httpproxy !#:+'
-#==============================================================================
-rpmsign        alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use database in DIRECTORY" \
-       --POPTargs=$"DIRECTORY"
-rpmsign        alias --ftpport         --define '_ftpport !#:+'
-rpmsign        alias --ftpproxy        --define '_ftpproxy !#:+'
-rpmsign        alias --httpport        --define '_httpport !#:+'
-rpmsign        alias --httpproxy       --define '_httpproxy !#:+'
-#==============================================================================
-rpmq   alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use database in DIRECTORY" \
-       --POPTargs=$"DIRECTORY"
-rpmq   alias --ftpport         --define '_ftpport !#:+'
-rpmq   alias --ftpproxy        --define '_ftpproxy !#:+'
-rpmq   alias --httpport        --define '_httpport !#:+'
-rpmq   alias --httpproxy       --define '_httpproxy !#:+'
-
-rpmq   alias --scripts --qf '\
-%|PREIN?{preinstall scriptlet\
-%|PREINPROG?{ (using %{PREINPROG})}|:\n%{PREIN}\n}:\
-{%|PREINPROG?{preinstall program: %{PREINPROG}\n}|}|\
-\
-%|POSTIN?{postinstall scriptlet\
-%|POSTINPROG?{ (using %{POSTINPROG})}|:\n%{POSTIN}\n}:\
-{%|POSTINPROG?{postinstall program: %{POSTINPROG}\n}|}|\
-\
-%|PREUN?{preuninstall scriptlet\
-%|PREUNPROG?{ (using %{PREUNPROG})}|:\n%{PREUN}\n}:\
-{%|PREUNPROG?{preuninstall program: %{PREUNPROG}\n}|}|\
-\
-%|POSTUN?{postuninstall scriptlet\
-%|POSTUNPROG?{ (using %{POSTUNPROG})}|:\n%{POSTUN}\n}:\
-{%|POSTUNPROG?{postuninstall program: %{POSTUNPROG}\n}|}|\
-\
-%|VERIFYSCRIPT?{verify scriptlet:\n%{VERIFYSCRIPT}\n}|\
-' \
-       --POPTdesc=$"list install/erase scriptlets from package(s)"
-
-rpmq   alias --conflicts       --qf \
-  "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" \
-       --POPTdesc=$"list capabilities this package conflicts with"
-rpmq   alias --obsoletes       --qf \
-  "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" \
-       --POPTdesc=$"list other packages removed by installing this package"
-rpmq   alias --provides        --qf \
-  "[%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}}:{}|\n]" \
-       --POPTdesc=$"list capabilities that this package provides"
-
-rpmq   alias --requires        --qf \
-  "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" \
-       --POPTdesc=$"list capabilities required by package(s)"
-rpmq   alias -R --requires
-
-rpmq   alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\
-Version     : %-27{VERSION}       Vendor: %{VENDOR}\n\
-Release     : %-27{RELEASE}   Build Date: %{BUILDTIME:date}\n\
-Install Date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed)         }|      Build Host: %{BUILDHOST}\n\
-Group       : %-27{GROUP}   Source RPM: %{SOURCERPM}\n\
-Size        : %-27{SIZE}%|LICENSE?{      License: %{LICENSE}}|\n\
-Signature   : %|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|\n\
-%|PACKAGER?{Packager    : %{PACKAGER}\n}|\
-%|URL?{URL         : %{URL}\n}|\
-Summary     : %{SUMMARY}\n\
-Description :\n%{DESCRIPTION}\n' \
-       --POPTdesc=$"list descriptive information from package(s)"
-
-rpmq   alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]' \
-       --POPTdesc=$"list change logs for this package"
-
-rpmq   alias --xml --qf '[%{*:xml}\n]' \
-       --POPTdesc=$"list metadata in xml"
-
-rpmq   alias --triggerscripts --qf '\
-[trigger%{TRIGGERTYPE} scriptlet (using %{TRIGGERSCRIPTPROG}) -- %{TRIGGERCONDS}\n\
-%{TRIGGERSCRIPTS}\n]'
-rpmq   alias --triggers --triggerscripts \
-       --POPTdesc=$"list trigger scriptlets from package(s)"
-
-rpmq   alias --last --qf '%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %{NAME}-%{VERSION}-%{RELEASE} %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n' \
-       --pipe "sort -r -n | sed 's,^[0-9]\+ ,,' | awk '{printf(\"%-45s %-s\n\", $1, substr($0,length($1)+2))}' " \
-       --POPTdesc=$"list package(s) by install time, most recent first"
-
-rpmq   alias --dupes   --qf '%|SOURCERPM?{%{name}.%{arch}}:{%|ARCH?{%{name}}:{%{name}-%{version}}|}|\n' --pipe "sort | uniq -d" \
-       --POPTdesc=$"list duplicated packages"
-
-rpmq   alias --filesbypkg --qf '[%-25{=NAME} %{FILENAMES}\n]' \
-       --POPTdesc=$"list all files from each package"
-
-rpmq   alias --fileclass --qf '[%{FILENAMES}\t%{FILECLASS}\n]' \
-       --POPTdesc=$"list file names with classes"
-
-rpmq   alias --filecolor --qf '[%{FILENAMES}\t%{FILECOLORS}\n]' \
-       --POPTdesc=$"list file names with colors"
-
-rpmq   alias --filecontext --qf '[%{FILENAMES}\t%{FILECONTEXTS}\n]' \
-       --POPTdesc=$"list file names with security context"
-
-rpmq   alias --fscontext --qf '[%{FILENAMES}\t%{FSCONTEXTS}\n]' \
-       --POPTdesc=$"list file names with security context from file system"
-
-rpmq   alias --recontext --qf '[%{FILENAMES}\t%{RECONTEXTS}\n]' \
-       --POPTdesc=$"list file names with security context from policy RE"
-
-rpmq   alias --fileprovide --qf '[%{FILENAMES}\t%{FILEPROVIDE}\n]' \
-       --POPTdesc=$"list file names with provides"
-
-rpmq   alias --filerequire --qf '[%{FILENAMES}\t%{FILEREQUIRE}\n]' \
-       --POPTdesc=$"list file names with requires"
-
-#==============================================================================
-rpmquery       alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use database in DIRECTORY" \
-       --POPTargs=$"DIRECTORY"
-rpmquery       alias --ftpport         --define '_ftpport !#:+'
-rpmquery       alias --ftpproxy        --define '_ftpproxy !#:+'
-rpmquery       alias --httpport        --define '_httpport !#:+'
-rpmquery       alias --httpproxy       --define '_httpproxy !#:+'
-
-rpmquery       alias --scripts --qf '\
-%|PREIN?{preinstall scriptlet\
-%|PREINPROG?{ (using %{PREINPROG})}|:\n%{PREIN}\n}:\
-{%|PREINPROG?{preinstall program: %{PREINPROG}\n}|}|\
-\
-%|POSTIN?{postinstall scriptlet\
-%|POSTINPROG?{ (using %{POSTINPROG})}|:\n%{POSTIN}\n}:\
-{%|POSTINPROG?{postinstall program: %{POSTINPROG}\n}|}|\
-\
-%|PREUN?{preuninstall scriptlet\
-%|PREUNPROG?{ (using %{PREUNPROG})}|:\n%{PREUN}\n}:\
-{%|PREUNPROG?{preuninstall program: %{PREUNPROG}\n}|}|\
-\
-%|POSTUN?{postuninstall scriptlet\
-%|POSTUNPROG?{ (using %{POSTUNPROG})}|:\n%{POSTUN}\n}:\
-{%|POSTUNPROG?{postuninstall program: %{POSTUNPROG}\n}|}|\
-\
-%|VERIFYSCRIPT?{verify scriptlet:\n%{VERIFYSCRIPT}\n}|\
-' \
-       --POPTdesc=$"list install/erase scriptlets from package(s)"
-
-rpmquery       alias --conflicts       --qf \
-  "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" \
-       --POPTdesc=$"list capabilities this package conflicts with"
-rpmquery       alias --obsoletes       --qf \
-  "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" \
-       --POPTdesc=$"list other packages removed by installing this package"
-rpmquery       alias --provides        --qf \
-  "[%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}}:{}|\n]" \
-       --POPTdesc=$"list capabilities that this package provides"
-
-rpmquery       alias --requires        --qf \
-  "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" \
-       --POPTdesc=$"list capabilities required by package(s)"
-rpmquery       alias -R --requires
-
-rpmquery       alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\
-Version     : %-27{VERSION}       Vendor: %{VENDOR}\n\
-Release     : %-27{RELEASE}   Build Date: %{BUILDTIME:date}\n\
-Install Date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed)         }|      Build Host: %{BUILDHOST}\n\
-Group       : %-27{GROUP}   Source RPM: %{SOURCERPM}\n\
-Size        : %-27{SIZE}%|LICENSE?{      License: %{LICENSE}}|\n\
-%|PACKAGER?{Packager    : %{PACKAGER}\n}|\
-%|URL?{URL         : %{URL}\n}|\
-Summary     : %{SUMMARY}\n\
-Description :\n%{DESCRIPTION}\n' \
-       --POPTdesc=$"list descriptive information from package(s)"
-
-rpmquery       alias --changelog --qf '[* %{CHANGELOGTIME:day} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]' \
-       --POPTdesc=$"list change logs for this package"
-
-rpmquery       alias --xml --qf '[%{*:xml}\n]' \
-       --POPTdesc=$"list metadata in xml"
-
-rpmquery       alias --triggerscripts --qf '\
-[trigger%{TRIGGERTYPE} scriptlet (using %{TRIGGERSCRIPTPROG}) -- %{TRIGGERCONDS}\n\
-%{TRIGGERSCRIPTS}\n]'
-rpmquery       alias --triggers --triggerscripts \
-       --POPTdesc=$"list trigger scriptlets from package(s)"
-
-rpmquery       alias --last --qf '%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %{NAME}-%{VERSION}-%{RELEASE} %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n' \
-       --pipe "sort -r -n | sed 's,^[0-9]\+ ,,' | awk '{printf(\"%-45s %-s\n\", $1, substr($0,length($1)+2))}' " \
-       --POPTdesc=$"list package(s) by install time, most recent first"
-
-rpmquery       alias --filesbypkg --qf '[%-25{=NAME} %{FILENAMES}\n]' \
-       --POPTdesc=$"list all files from each package"
-
-rpmquery       alias --fileclass --qf '[%{FILENAMES}\t%{FILECLASS}\n]' \
-       --POPTdesc=$"list file names with classes"
-
-rpmquery       alias --filecolor --qf '[%{FILENAMES}\t%{FILECOLORS}\n]' \
-       --POPTdesc=$"list file names with colors"
-
-rpmquery        alias --fscontext --qf '[%{FILENAMES}\n]' \
-        --pipe "xargs ls --scontext | awk '{printf(\"%s %s\n\", $2, $1)}'" \
-        --POPTdesc=$"list file names with security context from file system"
-
-rpmquery       alias --fileprovide --qf '[%{FILENAMES}\t%{FILEPROVIDE}\n]' \
-       --POPTdesc=$"list file names with provides"
-
-rpmquery       alias --filerequire --qf '[%{FILENAMES}\t%{FILEREQUIRE}\n]' \
-       --POPTdesc=$"list file names with requires"
-
-#==============================================================================
-rpmu   alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use database in DIRECTORY" \
-       --POPTargs=$"DIRECTORY"
-rpmu   alias --ftpport         --define '_ftpport !#:+'
-rpmu   alias --ftpproxy        --define '_ftpproxy !#:+'
-rpmu   alias --httpport        --define '_httpport !#:+'
-rpmu   alias --httpproxy       --define '_httpproxy !#:+'
-#==============================================================================
-rpmv   alias --dbpath          --define '_dbpath !#:+' \
-       --POPTdesc=$"use database in DIRECTORY" \
-       --POPTargs=$"DIRECTORY"
-rpmv   alias --ftpport         --define '_ftpport !#:+'
-rpmv   alias --ftpproxy        --define '_ftpproxy !#:+'
-rpmv   alias --httpport        --define '_httpport !#:+'
-rpmv   alias --httpproxy       --define '_httpproxy !#:+'
-
 # \endverbatim
 #*/