Changeset 1667 in ProjectBuilder

Timestamp:

Oct 27, 2012, 10:16:23 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Simplify Makefile by removing .pm modules in it
• Adds a new SSH.pm module to share between cb and cbusterize the Net:SSH2 initialization and closing phases
• cb now uses SSH.pm

Location:

projects/casparbuster/devel

Files:

• Makefile.PL (modified) (1 diff)
• bin/cb (modified) (5 diffs)
• lib/CasparBuster/SSH.pm (added)

projects/casparbuster/devel/Makefile.PL

@@ -22 +22 @@
             'bin/cb' => '$(INST_MAN1DIR)/cb.$(MAN1EXT)', 
     },
-    MAN3PODS      => {  
-            'lib/CasparBuster/Env.pm' => '$(INST_MAN3DIR)/CasparBuster::Env.$(MAN3EXT)',
-            'lib/CasparBuster/Version.pm' => '$(INST_MAN3DIR)/CasparBuster::Version.$(MAN3EXT)',
-                    },
+    #MAN3PODS      => { 
+    #'lib/CasparBuster/Env.pm' => '$(INST_MAN3DIR)/CasparBuster::Env.$(MAN3EXT)',
+    #'lib/CasparBuster/Version.pm' => '$(INST_MAN3DIR)/CasparBuster::Version.$(MAN3EXT)',
+    #},
 );
 

projects/casparbuster/devel/bin/cb

@@ -84 +84 @@
 use CasparBuster::Env;
 use CasparBuster::Plugin;
+use CasparBuster::SSH;
 #use Cwd 'realpath';
 use Carp qw/confess cluck/;
@@ -377 +378 @@
 my $chan;
 
-# deal with content first
-# Create remote connection and copy tar file there
-$ssh2 = Net::SSH2->new();
-$ssh2->debug(1) if ($debug > 2);
-
 my $mach = $machine;
 if ((defined $cb->{'commondir'}) && (defined $cb->{'commondir'}->{$machine})) {
@@ -387 +383 @@
     $mach = $cb->{'websrv'}->{$machine};
 }
-$ssh2->connect($mach);
-my $hdir = (getpwnam(getpwuid($<)))[7];
-if ($ssh2->auth_publickey($remote,"$hdir/.ssh/id_dsa.pub","$hdir/.ssh/id_dsa")) {
-    $chan = $ssh2->channel();
-    $chan->exec("mkdir -p $ENV{'PBTMP'}");
-    $chan->close;
-
-    $ssh2->scp_put($tarfile,$tarfile);
-    pb_log(0,"INFO: Created $ENV{'PBTMP'} on $remote\@$mach and copying content\n");
-} else {
-    pb_log(0,"ERROR: Unable to authenticate to $remote\@$mach\n");
-    return;
-}
+
+$ssh2 = cb_ssh_init($remote,$machine,$debug);
+
+$ssh2->scp_put($tarfile,$tarfile);
+pb_log(0,"INFO: Copying content under $ENV{'PBTMP'} on $remote\@$mach\n");
 
 my $path = "/";
@@ -408 +396 @@
 }
 $chan = $ssh2->channel();
-$chan->shell();
+confess "Unable to launch remote shell through Net:SSH2 ($remote\@$mach)" if (not $chan->shell());
+
 if (not $debug) {
     print $chan "sudo tar -C $path -x -f $tarfile $tbextract\n";
@@ -453 +442 @@
 }
 $chan->close();
-$ssh2->disconnect();
+
+cb_ssh_close($ssh2);
 
 chdir("/");