From f4931ef29cface28c69753588d3acb022edfc7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eray=20=C3=96zkural?= <eray@pardus.org.tr>
Date: Fri, 10 Jun 2005 11:48:04 +0000
Subject: [PATCH] * fix: usage goes into CLI of course, and put CLI proc. also
 in pisi-install

---
 src/pisi-build   | 12 ++++++------
 src/pisi-install | 36 ++++++++++++++++++++++++++++++++++++
 src/pisibuild.py |  5 -----
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/pisi-build b/src/pisi-build
index fcb600a9..cece5a6d 100644
--- a/src/pisi-build
+++ b/src/pisi-build
@@ -4,15 +4,16 @@
 # python standard library
 from os.path import basename
 
-from specfile import SpecFile
-from fetcher import Fetcher
-# import archive
-# import pisipackage
-# import pisiutils # patch, fileutils?
 import pisiconfig
 import util
 from pisibuild import PisiBuild
 
+def usage(progname = "pisi-build"):
+    print """
+Usage:
+%s [options] package-name.pspec
+""" %(progname)
+
 def main():
     import sys
     import getopt
@@ -44,7 +45,6 @@ def main():
     else:
 	pspec = args[0]
 
-
     # doing the real job... vs. vs...
     pb = PisiBuild(pspec)
     util.information("Building PISI package for: %s" % pb.packageName)
diff --git a/src/pisi-install b/src/pisi-install
index 39c64cd1..6f3ad931 100644
--- a/src/pisi-install
+++ b/src/pisi-install
@@ -1,3 +1,39 @@
 #! /usr/bin/python
 # -*- python -*-
 
+def usage(progname = "pisi-install"):
+    print """
+Usage:
+%s [options] package-name.pspec
+""" %(progname)
+    
+def main():
+    import sys
+    import getopt
+    
+    # wrapper for usage(progname) function
+    help = lambda: usage(sys.argv[0])
+
+    # getopt magic
+    try:
+	opts, args = getopt.getopt(sys.argv[1:],"h",["help"])
+    except getopt.GetoptError:
+	help()
+	sys.exit(1)
+
+    for opt, arg in opts:
+	if opt == "-h":
+	    help()
+	    sys.exit(1)
+
+    # package filename
+    packagefn = ""
+
+    # TODO: We accept only one pspec file (at a time) currently,
+    # but pisi-build may build many packages (pspecs given in order)
+    # sequentially.
+    if len(args) != 1:
+	help()
+	raise PisiBuildError, "pisi-install excepts one (and only one) pspec file currently"
+    else:
+	packagefn = args[0]
diff --git a/src/pisibuild.py b/src/pisibuild.py
index 84765e3d..88a33b13 100644
--- a/src/pisibuild.py
+++ b/src/pisibuild.py
@@ -34,8 +34,3 @@ class PisiBuild:
 	fetch = Fetcher(self.archiveUri)
 	fetch.fetch()
 
-def usage(progname = "pisi-build"):
-    print """
-Usage:
-%s [options] package-name.pspec
-""" %(progname)