Changeset fc8707b

Timestamp:

Oct 2, 2010, 9:20:02 PM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

master, debian, mac, no-cups

Children:

a5cf43b

Parents:

6b7441a

git-author:

Jessica B. Hamrick <jhamrick@…> (10/02/10 21:20:02)

git-committer:

Jessica B. Hamrick <jhamrick@…> (10/02/10 21:20:02)

Message:

Add '-hhelp' flags to all the client scripts

Add a '-ddryrun' option to gbr, to just list what would be done instead of doing it

Location:

client/bin

Files:

• gbq (modified) (1 diff)
• gbr (modified) (3 diffs)
• gbrm (modified) (2 diffs)
• gutenbach-client-config (modified) (4 diffs)

client/bin/gbq

@@ -11 +11 @@
 use Getopt::Long;
 
-my $usage = "Usage: gbq [-q QUEUE]\n";
+# usage
+my $usage = <<USAGE;
+Usage: gbq [options] [-q QUEUE]
 
+        -q, --queue             Specify a queue other than the default
+        -h, --help              Print this message
+USAGE
+
+# initialize the variables for the options
 my $q = "";
-GetOptions ('q|queue=s' => \$q);
+my $help = 0;
+
+# parse the options
+GetOptions ('q|queue=s' => \$q,
+            'h|help' => \$help);
+
+# if the -h flag was passed, then print the usage and exit
+if ($help) {
+    print $usage;
+    exit 0;
+}
 
 # if the -q option is not specified, then assume we're using the

client/bin/gbr

@@ -12 +12 @@
 use Image::ExifTool qw(ImageInfo);
 
-my $usage = "Usage: gbr QUEUE FILES\n";
+# the usage for this script
+my $usage = <<USAGE;
+Usage: gbr [options] [-q QUEUE] FILES
 
+        -q, --queue             Specify a queue other than the default
+        -d, --dryrun            Just list what would be done
+        -h, --help              Print this message
+USAGE
+
+# initialize the variables for the options
 my $q = "";
-GetOptions ('q|queue=s' => \$q);
+my $dryrun = 0;
+my $help = 0;
+
+# parse the options
+GetOptions ('q|queue=s' => \$q,
+            'd|dryrun' => \$dryrun,
+            'h|help' => \$help);
+
+# if the -h flag was passed, then print the usage and exit
+if ($help) {
+    print $usage;
+    exit 0;
+}
 
 my @files = @ARGV[0 .. $#ARGV];
@@ -61 +81 @@
 # if $printer is not defined, then throw an error
 unless( $printer){
-    print "Cannot access queue $q...do you have network connectivity and permission to view the queue?\n";
+    print "Cannot access queue $q... do you have network connectivity and permission to view the queue?\n";
     exit 1;
 }
@@ -100 +120 @@
     }
 
-    # send the print job, given the file and the job title
-    $jobid = $printer->printFile($file, $title);
-    
-    # if the printFile command returned a job id, then print that out
-    # for the user to see
-    if ($jobid) {
-        print "Sent job '$title' (id $jobid)\n";
-    }
+    # unless it's a dry run, send the print job, given the file and
+    # the job title
+    unless ($dryrun) {
+        $jobid = $printer->printFile($file, $title);
 
-    # otherwise, let them know that an error occurred
-    else {
-        print "Error sending job '$title'\n";
-    }
+        # if the printFile command returned a job id, then print that out
+        # for the user to see
+        if ($jobid) {
+            print "Sent job '$title' (id $jobid)\n";
+        }
+
+        # otherwise, let them know that an error occurred
+        else {
+            print "Error sending job '$title'\n";
+        }
+
+    # otherwise, just print what we would do
+    } else {
+        print "Would send file '$file' with title '$title'\n";
+    }    
 }

client/bin/gbrm

@@ -11 +11 @@
 use Getopt::Long;
 
-my $usage = "Usage: gbq [-q QUEUE] ID\n";
+# usage
+my $usage = <<USAGE;
+Usage: gbq [options] [-q QUEUE] ID
+
+        -q, --queue             Specify a queue other than the default
+        -h, --help              Print this message
+USAGE
+
+# initialize the variables for the options
 my $q = "";
-GetOptions ('q|queue=s' => \$q);
+my $help = 0;
+
+# parse the options
+GetOptions ('q|queue=s' => \$q,
+            'h|help', => \$help);
+
+# if the -h flag was passed, then print the usage and exit
+if ($help) {
+    print $usage;
+    exit 0;
+}
 
 my @ids = @ARGV[0 .. $#ARGV];
@@ -19 +37 @@
 # if the -q option is not specified, then assume we're using the
 # default queue
-if (!$q){
+if (!$q) {
     $q = "DEFAULT";
 }

client/bin/gutenbach-client-config

@@ -10 +10 @@
 # the usage for the program
 my $usage = <<USAGE;
-Usage: gutenbach-client-config [-l|--list|-a|--add|-d|--delete] [QUEUE] [--host=HOST]
+Usage: gutenbach-client-config [options]
 
         -l, --list              List available queues
@@ -16 +16 @@
         -d, --delete QUEUE      Delete a queue
         -s, --set-default QUEUE Set the default queue
-        -h, --host HOST         Hostname for the queue
+        -h, --host HOST         Hostname for the queue (must be used with -a)
+        -H, --help              Print this message
 USAGE
 
@@ -25 +26 @@
 my $host = "";
 my $default = "";
+my $help = 0;
 
 # get the options from the command line
@@ -31 +33 @@
             'a|add=s' => \$add,
             'd|delete=s' => \$delete,
-            'h|host=s' => \$host);
+            'h|host=s' => \$host,
+            'H|help' => \$help);
+
+# if the -H flag was passed, then print the usage and exit
+if ($help) {
+    print $usage;
+    exit 0;
+}
 
 # set the path where the configuration files live