Changeset 629

Timestamp:

04/08/07 19:26:45 (6 years ago)

Author:

lincoln

Message:

allow setting of command line options as per #43

Files:

• applications/shepherd (modified) (8 diffs)
• status (modified) (1 diff)

applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '0.4.85';
+my $version = '0.4.86';
 
 # tv_grab_au
@@ -165 +165 @@
 # ---------------------------------------------------------------------------
 
-&get_command_line_options;
+&get_command_line_options(1);
 
 &capabilities if ($opt->{capabilities});
@@ -185 +185 @@
 
 &process_setup_commands;
+&get_command_line_options(0) if (defined $components->{$progname}->{default_cmdline});
 
 &open_logfile unless ($opt->{nolog} or $opt->{update} or $opt->{configure});
@@ -1377 +1378 @@
 sub get_command_line_options
 {
-  # Record so we can pass the unmodified args to components later
-  @options = @ARGV;     # Record so we can pass the unmodified args to components later
-  push (@options,"") if ($#options == -1); # silence warnings if none
-
-  # filter what options we don't pass on ..
-  foreach (0..$#options) {
-    next if (!$options[$_]);
-
-    splice(@options,$_,2) if ($options[$_] =~ /^--config-file/);        # don't pass on "--config-file (file)"
-    splice(@options,$_,1) if ($options[$_] =~ /^--quiet/);              # never be quiet
+  my $use_argv = shift;
+
+  if ($use_argv) {
+    # Record so we can pass the unmodified args to components later
+    @options = @ARGV;   # Record so we can pass the unmodified args to components later
+    push (@options,"") if ($#options == -1); # silence warnings if none
+
+    # filter what options we don't pass on ..
+    foreach (0..$#options) {
+        next if (!$options[$_]);
+
+        splice(@options,$_,2) if ($options[$_] =~ /^--config-file/);    # don't pass on "--config-file (file)"
+        splice(@options,$_,1) if ($options[$_] =~ /^--quiet/);          # never be quiet
+    }
+  } else {
+    push(@ARGV,split(/:/,$components->{$progname}->{default_cmdline}));
   }
 
@@ -1401 +1408 @@
                         description
                         quiet
+                        notquiet
                         version
                         debug
@@ -1430 +1438 @@
   $debug = $opt->{debug};
   $days = $opt->{days} if ($opt->{days});
+  delete $opt->{quiet} if (defined $opt->{notquiet});
 }
 
@@ -1545 +1554 @@
     }
     my $arg = join(":",@args);
+
+    if ($component eq $progname) {
+        if ((!defined $arg) || ($arg eq "")) {
+            delete $components->{$progname}->{default_cmdline};
+            &log("\ncleared default options for $progname\n");
+        } else {
+            $components->{$progname}->{default_cmdline} = "--".join(":--",@args);
+            &log("\nset default options for $progname to: ".$components->{$progname}->{default_cmdline}."\n");
+        }
+        write_config_file();
+        return;
+    }
+
     if ((!defined $arg) || ($arg eq "")) {
         &log("\nNothing to set: you need to use this as --component-set (component):(settings)\n");
@@ -2195 +2217 @@
     --debug               Print lots of debugging messages
     --quiet               Don't print anything except errors
+    --notquiet            Override any previous --quiet
     --nolog               Don't write a logfile
 

status

@@ -1 @@
-application     shepherd            0.4.85
+application     shepherd            0.4.86
 grabber         yahoo7widget        1.82
 grabber         rex                 3.4.7