Changeset 2043 in ProjectBuilder

Timestamp:

Feb 19, 2016, 2:45:06 AM (8 years ago)

Author:

Bruno Cornec

Message:

• Split again the perl script apart in a file befor passing it through ssh to the VM to sort duplicated ssh keys

File:

• 0.13.2/pb/bin/pb (modified) (1 diff)

0.13.2/pb/bin/pb

@@ -4935 +4935 @@
 close(FILE);
 my $key = "\Q$zero1";
-
-pb_system("ssh -q -o UserKnownHostsFile=/dev/null -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} ".'perl -e \'my $file1="$ENV{\'HOME\'}/.ssh/authorized_keys"; open(PBFILE,$file1) || die "Unable to open $file1"; open(PBOUT,"> $file1.new") || die "Unable to open $file1.new"; my $count = 0; while (<PBFILE>) { '."if (/ $key /) { \$count++; } print PBOUT \$_ if ((\$count <= 1) || (\$_ !~ / $key /)); };".'close(PBFILE); close(PBOUT); rename("$file1.new",$file1); chmod 0600,$file1;\'',"","quiet");
+my $perls = "$ENV{'PBTMP'}/perls.$$";
+        
+open(FILE,"> $perls") || die "Unable to open $perls";
+print FILE << 'EOF';
+my $file1="$ENV{'HOME'}/.ssh/authorized_keys";
+open(PBFILE,$file1) || die "Unable to open $file1";
+open(PBOUT,"> $file1.new") || die "Unable to open $file1.new";
+my $count = 0;
+while (<PBFILE>) {
+EOF
+print FILE << "EOF";
+    if (/ $key /) {
+        \$count++;
+    }
+    print PBOUT \$_ if ((\$count <= 1) || (\$_ !~ / $key /));
+}
+close(PBFILE);
+close(PBOUT);
+rename("\$file1.new",\$file1);
+chmod 0600,\$file1;
+EOF
+close(FILE);
+pb_system("cat $perls | ssh -q -o UserKnownHostsFile=/dev/null -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} perl","","quiet");
 return;
 }