Changeset 251

Timestamp:

06/13/07 10:52:02 (1 year ago)

Author:

ludo

Message:

Do not depend on xprobe. chmod of .exe files improved (from r4478)

Files:

• trunk/webmin/lsc/debian/control (modified) (1 diff)
• trunk/webmin/lsc/include/copy.inc.php (modified) (2 diffs)
• trunk/webmin/lsc/include/ssh.inc.php (modified) (1 diff)
• trunk/webmin/lsc/xprobe_safe (modified) (1 diff)

trunk/webmin/lsc/debian/control

@@ -9 +9 @@
-Section: utils
-Architecture: all
-, xprobe (>> 0.2.0)
+
-Recommends: samba-common
-Suggests: lbs

trunk/webmin/lsc/include/copy.inc.php

@@ -92 +92 @@
-                $basename = trim(basename($f));
-                debug(2, "LSC_COPY : Dirname : \"".$dirname."\" Basename : \"".trim($basename)."\"");
+
+                /*
+                 * chmod +x on *.bat and *.exe
+                 */
+                $chmod_command = "find $path_source -iname '*.exe' -or -iname '*.bat' -exec chmod 755 {} \\;";
+                unset($output); unset($stdout); unset($stderr); unset($return_var);
+                lsc_exec($chmod_command, $output, $return_var, $stdout, $stderr);
+
-                /*
-                 * Make directory step
-
-
+
-                unset($output); unset($return_var); unset($stdout); unset($stderr);
-                $mkdir_command = "test -d '".$path_destination."' || mkdir -p '".$path_destination."'";
@@ -160 +167 @@
-                }
-                debug(1, sprintf("File successfully copied, command is %s", $scp_command));
-                
-                /*
-                 * chmod +x on *.bat and *.exe
-                 */
-                $chmod_command = "chmod ugo+x -R \"$path_destination_mount_ssh\"/*.exe";
-                unset($output); unset($stdout); unset($stderr); unset($return_var);
-                lsc_exec($chmod_command, $output, $return_var, $stdout, $stderr);
-
-                $chmod_command = "chmod ugo+x -R \"$path_destination_mount_ssh\"/*.bat";
-                unset($output); unset($stdout); unset($stderr); unset($return_var);
-                lsc_exec($chmod_command, $output, $return_var, $stdout, $stderr);
-        }
-        return $result;

trunk/webmin/lsc/include/ssh.inc.php

@@ -407 +407 @@
-                        unset($output); unset($return_var); unset($stdout); unset($stderr);
-                        lsc_exec("./xprobe_safe ".$this->ip, $output, $return_var, $stdout, $stderr);
-
-
+
-                } else {
-                        $type = $known_type;

trunk/webmin/lsc/xprobe_safe

@@ -1 +1 @@
-#!/usr/bin/perl
-
-xprobe2 -M 6 $ARGV[0] 2>&1
+ssh -tt -o StrictHostKeyChecking=no -o Batchmode=yes root@".$ARGV[0]." 'echo \$OS;uname'
-eval {
-    local $SIG{ALRM} = sub { die "TIMEDOUT" };
-    alarm(10);
- (<PIPE>) { print <PIPE>
+(<PIPE>) { print $_
-    close(PIPE);
-    alarm(0);