From b890dcecab89291cbe1fa3bb5c2dd1866e7d6b1d Mon Sep 17 00:00:00 2001
From: lxnay <lxnay@cd1c1023-2f26-0410-ae45-c471fc1f0318>
Date: Mon, 6 Aug 2007 13:18:54 +0000
Subject: [PATCH] reorganize equo menu

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@399 cd1c1023-2f26-0410-ae45-c471fc1f0318
---
 client/equo         | 22 +++++++++++-----------
 client/equoTools.py |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/equo b/client/equo
index 130696a51..13538ed11 100644
--- a/client/equo
+++ b/client/equo
@@ -39,15 +39,15 @@ def print_help():
     print_info("  --verbose\t\tbe more verbose")
     print_info("  --nocolor\t\tdisable colorized output")
     print_info(red("Tools available: "))
-    print_info(" \t"+blue(bold("repo"))+brown("\t\t to handle package repositories"))
-    print_info(" \t\t"+darkgreen("sync")+red("\t\t\t sync repositories"))
-    print_info(" \t\t\t"+red("--force")+"\t\t force the sync even if the database is already up to date")
-    print_info(" \t\t"+darkgreen("show")+red("\t\t\t show enabled repositories"))
-    print_info(" \t\t"+darkgreen("status")+red("\t\t\t show respositories status"))
+    #print_info(" \t"+blue(bold("repo"))+brown("\t\t to handle package repositories"))
+    print_info(" \t"+blue("update")+brown("\t\t update repositories (download new data)"))
+    print_info(" \t\t"+red("--force")+"\t\t\t force the sync even if the database is already up to date")
+    print_info(" \t"+blue("repoinfo")+brown("\t show enabled repositories"))
+    print_info(" \t"+blue("status")+brown("\t\t show respositories status"))
     
     #print_info(" \t"+darkgreen(bold("package"))+brown("\t\t to handle packages"))
-    print_info(" \t"+blue("search")+brown("\t\t to search a package trough repositories"))
-    print_info(" \t"+blue("install")+brown("\t\t to install a package"))
+    print_info(" \t"+blue("search")+brown("\t\t search a package trough repositories"))
+    print_info(" \t"+blue("install")+brown("\t\t install a package"))
     print_info(" \t\t"+red("--ask")+"\t\t\t ask before making any changes")
     print_info(" \t\t"+red("--pretend")+"\t\t just show what would be done")
     print_info(" \t\t"+red("--fetch")+"\t\t\t just download packages without doing the install")
@@ -55,13 +55,13 @@ def print_help():
     print_info(" \t\t"+red("--empty")+"\t\t\t also include already installed packages")
     print_info(" \t\t"+red("--verbose")+"\t\t show more details about what's going on")
 
-    print_info(" \t"+blue(bold("query"))+brown("\t\t to do misc queries on repository and local databases"))
+    print_info(" \t"+blue(bold("query"))+brown("\t\t do misc queries on repository and local databases"))
     print_info(" \t\t"+darkgreen("installed")+red("\t\t search a package into the local database"))
     print_info(" \t\t"+darkgreen("belongs")+red("\t\t\t search from what package a file belongs"))
     print_info(" \t\t"+darkgreen("depends")+red("\t\t\t search which packages depend on the provided atom"))
     print_info(" \t\t"+darkgreen("description")+red("\t\t search a package description"))
 
-    print_info(" \t"+blue(bold("database"))+brown("\t to handle installed packages database"))
+    print_info(" \t"+blue(bold("database"))+brown("\t handle installed packages database"))
     print_info(" \t\t"+darkgreen("generate")+red("\t\t generate installed packages database"))
 
 options = sys.argv[1:]
@@ -90,8 +90,8 @@ if len(options) < 1 or string.join(options).find("--help") != -1 or string.join(
     sys.exit(1)
 
 # sync mirrors tool
-elif (options[0] == "repo"):
-    rc = equoTools.repositories(options[1:])
+elif (options[0] == "update") or (options[0] == "repoinfo") or (options[0] == "status"):
+    rc = equoTools.repositories(options)
     sys.exit(rc)
 
 elif (options[0] == "search") or (options[0] == "install"):
diff --git a/client/equoTools.py b/client/equoTools.py
index c7e0a78ab..4cfd6d2e5 100644
--- a/client/equoTools.py
+++ b/client/equoTools.py
@@ -61,14 +61,14 @@ def repositories(options):
 	elif (opt == "--force"):
 	    equoRequestForceUpdate = True
 
-    if (options[0] == "sync"):
+    if (options[0] == "update"):
 	rc = syncRepositories(forceUpdate = equoRequestForceUpdate)
 
     if (options[0] == "status"):
 	for repo in etpRepositories:
 	    showRepositoryInfo(repo)
 
-    if (options[0] == "show"):
+    if (options[0] == "repoinfo"):
 	showRepositories()
     return rc