From 0559c5960fa3caf8532cf9a7499464bcc7239b6d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Nov 2018 12:24:32 +0000 Subject: add dash dash :D --- src/backend/libsisyphus.py | 34 ++++++++++++++++++---------------- src/frontend/cli/sisyphus-cli.py | 32 ++++++++++++++++---------------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index 5a41e35..ec2d848 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -262,7 +262,7 @@ def startInstall(pkgList): else: sys.exit("\n" + "No package found; Quitting." + "\n") else: - sys.exit("\n" + "No binary package found; Source package found; Use sisyphus hybrid-install; Quitting." + "\n") + sys.exit("\n" + "No binary package found; Source package found; Use sisyphus --hybrid-install; Quitting." + "\n") def startHybridInstall(pkgList): syncAll() @@ -394,7 +394,7 @@ def startUpgrade(): else: sys.exit("\n" + "No package upgrades found; Quitting." + "\n") else: - sys.exit("\n" + "No binary package upgrades found; Source package upgrades found; Use sisyphus hybrid-upgrade; Quitting." + "\n") + sys.exit("\n" + "No binary package upgrades found; Source package upgrades found; Use sisyphus --hybrid-upgrade; Quitting." + "\n") def startHybridUpgrade(): syncAll() @@ -547,47 +547,49 @@ def showHelp(): print("an apt-get/yum-alike interface to these commands, to assist newcomer people transitioning from") print("Debian/RedHat-based systems to Gentoo." + "\n") print("Commands :" + "\n") - print("install") + print("--install") print("* Install binary packages" + "\n") - print("hybrid-install") + print("--hybrid-install") print("* Install binary and/or ebuild (source) packages" + "\n") - print("uninstall") + print("--uninstall") print("* Uninstall packages *SAFELY* by checking for reverse dependencies") print("* If reverse dependencies exist, the package(s) will NOT be uninstalled to prevent the possible breakage of the system") print("* If you really want to uninstall the package, make sure you uninstall all reverse dependencies as well") print("* This will not allways be possible, as the reverse dependency chain may be way to long and require you to uninstall critical system packages" + "\n") - print("force-uninstall") + print("--force-uninstall") print("* Uninstall packages *UNSAFELY* by ignoring reverse dependencies") print("* This may break your system if you uninstall critical system packages") print("* It will try the best it can to preserve the libraries required by other packages to prevent such a breakage") print("* Upgrading the system may pull the packages back in, to fix the reverse dependency chain" + "\n") - print("remove-orphans") + print("--remove-orphans") print("* Uninstall packages that are no longer needed") print("* When you uninstall a package without it's reverse dependencies, those dependencies will become orphans if nothing else requires them") print("* In addition, a package may no longer depend on another one, so that other package becomes orphan as well if nothing else requires it") print("* Use this option to check the whole dependency chain for such packages, and uninstall them" + "\n") - print("update") + print("--update") print("* Update the Portage tree, Overlay(s), Portage config files && Sisyphus's package database" + "\n") - print("upgrade") + print("--upgrade") print("* Upgrade the system using binary packages" + "\n") - print("hybrid-upgrade") + print("--hybrid-upgrade") print("* Upgrade the system using binary and/or ebuild (source) packages" + "\n") - print("search") + print("--search") print("* Search for packages") print("* In binary mode this will return available binary packages") print("* In source mode this will return binary and ebuild (source) packages" + "\n") - print("spmsync") + print("--spmsync") print("* Sync Sisyphus's package database with Portage's package database") print("* When you install something with Portage directly (emerge), Sisyphus is not aware of that package, and it doesn't track it in it's database") print("* Use this option to synchronize Sisyphus's package database with Portage's package database" + "\n") - print("rescue") + print("--rescue") print("* Resurrect Sisyphus's package database if lost or corrupted") print("* If for some reason Sisyphus's package database is lost or corrupted, it can be resurrected using Portage's package database") print("* If Portage's package database is corrupted (in this case you're screwed anyway :D), only a partial resurrection will be possible") print("* If Portage's package database is intact, full resurrection will be possible" + "\n") - print("mirror list") + print("--mirror --list") print("* List available mirrors (the active one is marked with *)" + "\n") - print("mirror set INDEX") + print("--mirror --set INDEX") print("* Switch the repository to the selected mirror" + "\n") - print("sysinfo") + print("--sysinfo") print("* Display information about installed core packages and portage configuration" + "\n") + print("--help") + print("* Display this help information" + "\n") diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index 3a1623e..9a325c4 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -7,56 +7,56 @@ pkgList = sys.argv[2:] if "__main__" == __name__: if sys.argv[1:]: - if "install" in sys.argv[1:]: + if "--install" in sys.argv[1:]: if not pkgList: sys.exit("\n" + "Nothing to install, please give at least one package name; quitting" + "\n") else: startInstall(pkgList) - elif "hybrid-install" in sys.argv[1:]: + elif "--hybrid-install" in sys.argv[1:]: if not pkgList: sys.exit("\n" + "Nothing to install, please give at least one package name; quitting" + "\n") else: startHybridInstall(pkgList) - elif "uninstall" in sys.argv[1:]: + elif "--uninstall" in sys.argv[1:]: if not pkgList: sys.exit("\n" + "Nothing to uninstall, please give at least one package name; quitting" + "\n") else: startUninstall(pkgList) - elif "force-uninstall" in sys.argv[1:]: + elif "--force-uninstall" in sys.argv[1:]: if not pkgList: sys.exit("\n" + "Nothing to force uninstall, please give at least one package name; quitting" + "\n") else: startUninstallForce(pkgList) - elif "remove-orphans" in sys.argv[1:]: + elif "--remove-orphans" in sys.argv[1:]: removeOrphans() - elif "update" in sys.argv[1:]: + elif "--update" in sys.argv[1:]: startSync() - elif "upgrade" in sys.argv[1:]: + elif "--upgrade" in sys.argv[1:]: startUpgrade() - elif "hybrid-upgrade" in sys.argv[1:]: + elif "--hybrid-upgrade" in sys.argv[1:]: startHybridUpgrade() - elif "search" in sys.argv[1:]: + elif "--search" in sys.argv[1:]: if not pkgList: sys.exit("\n" + "Nothing to search, please give at least one package name; quitting" + "\n") else: startSearch(pkgList) - elif "spmsync" in sys.argv[1:]: + elif "--spmsync" in sys.argv[1:]: startSyncSPM() - elif "rescue" in sys.argv[1:]: + elif "--rescue" in sys.argv[1:]: rescueDB() - elif "sysinfo" in sys.argv[1:]: + elif "--sysinfo" in sys.argv[1:]: sysInfo() - elif "mirror" in sys.argv[1:]: - if "list" in sys.argv[2:]: + elif "--mirror" in sys.argv[1:]: + if "--list" in sys.argv[2:]: printMirrorList() - elif "set" in sys.argv[2:]: + elif "--set" in sys.argv[2:]: if sys.argv[3:]: setActiveMirror(sys.argv[3:]) else: showHelp() else: showHelp() - elif "help" in sys.argv[1:]: + elif "--help" in sys.argv[1:]: showHelp() else: showHelp() -- cgit v1.2.3