Changeset 415 for trunk

Timestamp:

Oct 8, 2019, 6:32:05 PM (5 years ago)

Author:

g7moreau

Message:

• Small error on command

File:

• trunk/backuppc-silzigan/backuppc-silzigan (modified) (4 diffs)

trunk/backuppc-silzigan/backuppc-silzigan

@@ -125 +125 @@
       print "$pcname 0 sleeping $admin,$user\n" >> io('/etc/backuppc/hosts.oldcomputer');
       }
+   }
+
+#-------------------------------------------------------------------------------
+
+sub shell_command {
+   my $cmd = shift;
+
+   require FileHandle;
+   my $fh     = new FileHandle;
+   my @result = ();
+   open $fh, q{-|}, "LANG=C $cmd" or die "Can't exec $cmd\n";
+   @result = <$fh>;
+   close $fh;
+   chomp @result;
+   return @result;
    }
 
@@ -226 +241 @@
             }
 
+         print STDERR "Info: write_config($user, $computer, $share, $login, $admin, $status)\n" if $verbose;
          write_config($user, $computer, $share, $login, $admin, $status, $CONFIG, $exclude_string);
 
@@ -233 +249 @@
          my $home_path = $CONFIG->{computers}{$computer}{subfolder};
          print STDERR "\nInfo: ssh on $login\@$computer\n" if $verbose;
-         my @ls = `/bin/ping -W 2 -c 1 $computer > /dev/null 2>&1 && {
-            /usr/bin/nmap  -p 22 -PN $computer | grep -q '^22/tcp[[:space:]]*open\b' && {
-               /usr/bin/rsync --dry-run $login\@$computer:$home_path /tmp/backuppc-test/ || echo Error for $login\@$computer | logger -t backuppc-silzigan;
+         my @ls = shell_command("/bin/ping -W 2 -c 1 '$computer' > /dev/null 2>&1 && {
+            /usr/bin/nmap  -p 22 -PN '$computer' | grep -q '^22/tcp[[:space:]]*open' && {
+               /usr/bin/rsync --dry-run '$login\@$computer:$home_path' /tmp/backuppc-test/ || echo Error for '$login\@$computer' | logger -t backuppc-silzigan;
                };
-            };`;
+            };");
 
          $home_path =~ s{/[^/]*$}{};
@@ -290 +306 @@
                }
 
+            print STDERR "Info: write_config($user, $computer, $share, $login, $admin, $status)\n" if $verbose;
             write_config($user, $computer, $share, $login, $admin, $status, $CONFIG, $exclude_string);
             }