SF.net SVN: morphix: [2154] trunk/mmaker/src

Revision: 2154
Author:   alextreme
Date:     2006-03-22 09:50:50 -0800 (Wed, 22 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/morphix/?rev=2154&view=rev

Log Message:
-----------
  * changing mmaker's -r command to -c (consistent with isomaker and manual)
  * some minor textual changes of options

Modified Paths:
--------------
    trunk/mmaker/src/isomaker.c
    trunk/mmaker/src/main.c
Modified: trunk/mmaker/src/isomaker.c
===================================================================
--- trunk/mmaker/src/isomaker.c	2006-03-21 22:14:41 UTC (rev 2153)
+++ trunk/mmaker/src/isomaker.c	2006-03-22 17:50:50 UTC (rev 2154)
@@ -30,7 +30,7 @@
 #define MAKEISO_PATH "/usr/bin/make-iso"
 
 void usage(gchar *filename) {
-	printf("Usage: %s -b basemod.xml [-g debootstrap.tar.gz] [-m mainmod.xml] [-m mainmod2.xml] [-r repository [-p package1] [-p package2]] output.iso\n",filename);
+	printf("Usage: %s -b basemod.xml [-g debootstrap.tar.gz] [-t tarball.tar.gz] [-m mainmod.xml] [-m mainmod2.xml] [-c] [-v] [-r repository [-p package1] [-p package2]] output.iso\n",filename);
 
 	printf("\t-b:\tBase module template to build output.iso with\n");
 	printf("\t-m:\tMain module template to include in output.iso\n");

Modified: trunk/mmaker/src/main.c
===================================================================
--- trunk/mmaker/src/main.c	2006-03-21 22:14:41 UTC (rev 2153)
+++ trunk/mmaker/src/main.c	2006-03-22 17:50:50 UTC (rev 2154)
@@ -24,7 +24,7 @@
 #include "../libmorphix/makemodule.h"
 
 void usage(gchar *filename) {
-	printf("Usage: %s [-g debootstrap.tar.gz] [-a /path/to/package1.deb [-a /path/to/package2.deb]] [-b debootstrap.tar.bz] [-m miniroot.gz] [-k vmlinuz-mykernel] [-t /tempdir] [-d /debootstrapped] [-p http://proxy.mydomain.com:8080] [-v] [-i] input.xml output.mod\n\n",filename);
+	printf("Usage: %s [-g debootstrap.tar.gz] [-b debootstrap.tar.bz] [-a /path/to/package1.deb [-a /path/to/package2.deb]] [-m miniroot.gz] [-k vmlinuz-mykernel] [-t /tempdir] [-d /debootstrapped] [-p http://proxy.mydomain.com:8080] [-v] [-i] [-c] input.xml output.mod\n\n",filename);
 
 	printf("\t-g:\tuse supplied tarball as debootstrap for building module with\n");
 	printf("\t-a:\tadd this package to the module\n");
@@ -36,7 +36,7 @@
 	printf("\t-p:\tuse this to specify a http proxy for apt. Use URI as 'http://proxy.mydomain.com:8080'\n");
 	printf("\t-i:\tinteractive mode\n");
 	printf("\t-v:\tverbose mode\n");
-	printf("\t-r:\tremove the temporary directory (%s/libmorphix*) afterwards, incompatible with -m\n",getTempRoot());
+	printf("\t-c:\tclean, remove the temporary directory (%s/libmorphix*) afterwards, incompatible with -m\n",getTempRoot());
 	printf("\nThis tool is made possible by an infinite amount of monkeys\n");
 }
 
@@ -78,7 +78,7 @@
 		return(EXIT_FAILURE);
 	}
 	
-	while ((optchar = getopt(argc,argv,"t:d:g:b:k:m:p:irv")) != -1) {
+	while ((optchar = getopt(argc,argv,"t:d:g:b:k:m:p:icv")) != -1) {
 	  switch (optchar) {
 	  case 't':
 		  // set temporary directory
@@ -118,7 +118,7 @@
 	          opts+=1;
 		  interactive = TRUE;
 		  break;
-	  case 'r':
+	  case 'c':
 	          opts+=1;
 		  if (miniroot == NULL) {
 			  leave_dir = FALSE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642