s/options/option/, oops, and machine isn't an option

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 870d7f1..e95939b 100644 (file)
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -24,8 +24,8 @@ sub _export_command {
   no strict 'refs';
   ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   $self->shellcommands_queue( $svc_acct->svcnum,
   no strict 'refs';
   ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   $self->shellcommands_queue( $svc_acct->svcnum,

-    user         => $self->options('user')||'root',
-    host         => $self->options('machine'),
+    user         => $self->option('user')||'root',
+    host         => $self->machine,

     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );
     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );


@@ -39,8 +39,8 @@ sub _export_replace {
   ${"old_$_"} = $old->getfield($_) foreach $old->fields;
   ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   $self->shellcommands_queue( $new->svcnum,
   ${"old_$_"} = $old->getfield($_) foreach $old->fields;
   ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   $self->shellcommands_queue( $new->svcnum,

-    user         => $self->options('user')||'root',
-    host         => $self->options('machine'),
+    user         => $self->option('user')||'root',
+    host         => $self->machine,

     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );
     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );

diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 870d7f1..e95939b 100644 (file)
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -24,8 +24,8 @@ sub _export_command {
   no strict 'refs';
   ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   $self->shellcommands_queue( $svc_acct->svcnum,
   no strict 'refs';
   ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   $self->shellcommands_queue( $svc_acct->svcnum,

-    user         => $self->options('user')||'root',
-    host         => $self->options('machine'),
+    user         => $self->option('user')||'root',
+    host         => $self->machine,

     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );
     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );


@@ -39,8 +39,8 @@ sub _export_replace {
   ${"old_$_"} = $old->getfield($_) foreach $old->fields;
   ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   $self->shellcommands_queue( $new->svcnum,
   ${"old_$_"} = $old->getfield($_) foreach $old->fields;
   ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   $self->shellcommands_queue( $new->svcnum,

-    user         => $self->options('user')||'root',
-    host         => $self->options('machine'),
+    user         => $self->option('user')||'root',
+    host         => $self->machine,

     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );
     command      => eval(qq("$command")),
     stdin_string => eval(qq("$stdin")),
   );