Changeset 1679 in ProjectBuilder for projects/casparbuster/devel/bin

Timestamp:

Nov 16, 2012, 9:07:07 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Start working on plugins

Location:

projects/casparbuster/devel/bin

Files:

• cb (modified) (3 diffs)
• cbusterize (modified) (3 diffs)

projects/casparbuster/devel/bin/cb

@@ -281 +281 @@
     die "ERROR: Only able to handle files or dirs with option --source\n" if ((! -d $fullsource) && (! -f $fullsource));
 
-    # We should get uid/gid fro elsewhere as they're probably wrong locally
+    # We should get uid/gid from elsewhere as they're probably wrong locally
     $cbp->{"cb.source"}->{$type}->{$source}->{'uid'} = $uid;
     $cbp->{"cb.source"}->{$type}->{$source}->{'gid'} = $gid;
@@ -294 +294 @@
     $findtarget = "$dest/$machine";
     find(\&cb_add_to_cbp,($findtarget));
+    # And we also need all what is common, but not what is for the web side
+    foreach my $c (keys $cb->{'commondir'}) {
+        $findtarget = "$dest/$c";
+        opendir(DIR,"$findtarget") || die "Unable to open $dest/$c: $!";
+        foreach my $m (readdir(DIR)) {
+            next if ($m =~ /^\./);
+            next if ($m eq $cb->{'commondir'}->{$c});
+            find(\&cb_add_to_cbp,("$findtarget/$m"));
+        }
+        closedir(DIR);
+    }
 }
 pb_log(1,"INFO: RAW cbp: ".Dumper(%$cbp)."\n");
@@ -415 +426 @@
             if ((defined $force) || (not defined $cbp->{$k}->{$type}->{$o}->{'deleted'})) {
                 if ($debug) {
-                    pb_log(1,"INFO: Executing (on $machine) sudo chown $cbp->{$k}->{$type}->{$o}->{'uid'}:$cbp->{$k}->{$type}->{$o}->{'gid'} $path/$o\n");
+                    #pb_log(1,"INFO: Executing (on $machine) sudo chown $cbp->{$k}->{$type}->{$o}->{'uid'}:$cbp->{$k}->{$type}->{$o}->{'gid'} $path/$o\n");
                     #pb_log(1,"INFO: Executing (on $machine) sudo chmod $cbp->{$k}->{$type}->{$o}->{'mode'} $path/$o\n");
                 } else {
                     # TODO: remove hardcoded commands
-                    print $chan "sudo chown $cbp->{$k}->{$type}->{$o}->{'uid'}:$cbp->{$k}->{$type}->{$o}->{'gid'} $path/$o\n";
+                    #print $chan "sudo chown $cbp->{$k}->{$type}->{$o}->{'uid'}:$cbp->{$k}->{$type}->{$o}->{'gid'} $path/$o\n";
                     # TODO: get a correct mode before setting it up
                     #print $chan "sudo chmod $cbp->{$k}->{$type}->{$o}->{'mode'} $path/$o\n";

projects/casparbuster/devel/bin/cbusterize

@@ -215 +215 @@
 pb_log(1, "DEBUG: remote account2 = $remote\n");
 
+$ssh2 = cb_ssh_init($remote,$machine,$debug) if (not defined $ssh2);
+
 # Create basedir if it doesn't exist
 if (not -d $basedir) {
@@ -236 +238 @@
     foreach my $p (split(/,/,$plugin)) {    
         pb_log(1,"Getting context for plugin $p\n");
-        $cbp = cb_plugin_get($p,$cbp);
+        $cbp = cb_plugin_get($p,$cbp,$remote,$machine,$debug,$ssh2);
         pb_log(2,"cbp: ".Dumper($cbp)."\n");
         foreach my $k (keys %{$cbp->{$plugin}->{'dirsandfiles'}}) {
@@ -260 +262 @@
 my $realsrc = "";
 my $type = "";
-
-$ssh2 = cb_ssh_init($remote,$machine,$debug) if (not defined $ssh2);
 
 $chan = $ssh2->channel();