diff --git a/conf/slpkg.bash-completion b/conf/slpkg.bash-completion index bf803aee..70dfa075 100644 --- a/conf/slpkg.bash-completion +++ b/conf/slpkg.bash-completion @@ -4,7 +4,7 @@ _slpkg() cur=${COMP_WORDS[COMP_CWORD]} if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W "--autobuild --blacklist --queue --list --check --sync --tracking --print --network --FIND --find --install --upgrade --reinstall --remove --display" -- $cur )) + COMPREPLY=( $( compgen -W "--autobuild --blacklist --queue --list --check --sync --tracking --print --network --FIND --find --install --install-new --reinstall --remove --display" -- $cur )) else _filedir diff --git a/conf/slpkg.fish b/conf/slpkg.fish index e9fe50fe..5b907249 100644 --- a/conf/slpkg.fish +++ b/conf/slpkg.fish @@ -13,7 +13,7 @@ complete --command slpkg --long-option network --short-option n --description 'V complete --command slpkg --long-option find --short-option f --description 'Find and print installed packages reporting the size and the sum.' complete --command slpkg --long-option FIND --short-option F --description 'Find packages from repositories and search at each enabled repository and prints results.' complete --command slpkg --long-option install --short-option i --description 'Installs single or multiple Slackware binary packages.' -complete --command slpkg --long-option upgrade --short-option u --description 'Upgrade single or multiple Slackware binary packages from a older to a newer one.' +complete --command slpkg --long-option install-new --short-option u --description 'Upgrade single or multiple Slackware binary packages from a older to a newer one.' complete --command slpkg --long-option reinstall --short-option o --description 'Reinstall signle or multiple Slackware binary packages with the same packages if the exact.' complete --command slpkg --long-option remove --short-option r --description 'Removes a previously installed Slackware binary packages.' complete --command slpkg --long-option display --short-option d --description 'Display the installed packages contents and file list.' diff --git a/man/slpkg.8 b/man/slpkg.8 index 8ee88170..01f8fe1e 100644 --- a/man/slpkg.8 +++ b/man/slpkg.8 @@ -179,7 +179,7 @@ build or install etc. Installs single binary packages designed for use with the Slackware Linux distribution into your system. -.SS -u, --upgrade, install-upgrade Slackware binary packages with new +.SS -u, --install-new, install-upgrade Slackware binary packages with new \fBslpkg\fP \fB-u\fP <\fIpackages.t?z\fP> .PP Normally upgrade only upgrades packages that are already installed on the system, diff --git a/slpkg/arguments.py b/slpkg/arguments.py index 89b3eeb2..511bf780 100644 --- a/slpkg/arguments.py +++ b/slpkg/arguments.py @@ -101,7 +101,7 @@ Optional arguments: reporting the size and the sum. -i, --install, [package...] Installs single or multiple Slackware binary packages. - -u, --upgrade, [package...] Upgrade single or multiple Slackware + -u, --install-new, [package...] Upgrade single or multiple Slackware binary packages from a older to a newer one. -o, --reinstall, [package...] Reinstall signle or multiple diff --git a/slpkg/main.py b/slpkg/main.py index 5e0f1773..06fc2426 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -75,7 +75,7 @@ class ArgParse(object): if (len(self.args) > 1 and self.args[0] in ["-f", "--find", "-i", "--install", "-u", - "--upgrade", "-o", "--reinstall", "-r", + "--install-new", "-o", "--reinstall", "-r", "--remove", "-d", "--display", "-n", "--network"] and self.args[1].endswith(".pkg")): @@ -334,7 +334,7 @@ class ArgParse(object): def bin_upgrade(self): """ install-upgrade Slackware binary packages """ - options = ["-u", "--upgrade"] + options = ["-u", "--install-new"] if len(self.args) > 1 and self.args[0] in options: PackageManager(self.packages).upgrade() else: @@ -465,7 +465,7 @@ def main(): "-i": argparse.bin_install, "--install": argparse.bin_install, "-u": argparse.bin_upgrade, - "--upgrade": argparse.bin_upgrade, + "--install-new": argparse.bin_upgrade, "-o": argparse.bin_reinstall, "--reinstall": argparse.bin_reinstall, "-r": argparse.bin_remove,