# HG changeset patch
# User devi
# Date 1138348390 -7200
# Node ID b7a217f8e963c6b281e6c9c575a01e7c4a7e9190
# Parent  3326053f9b23353af6ae0f4fbe82dff264733a47
Небольшие исправления

diff -r 3326053f9b23 -r b7a217f8e963 l3-agent
--- a/l3-agent	Fri Jan 27 09:04:44 2006 +0200
+++ b/l3-agent	Fri Jan 27 09:53:10 2006 +0200
@@ -545,7 +545,7 @@
             err
             last_command
             )) {
-            next unless $cl->{"$element"};
+            next unless defined($cl->{"$element"});
             print OUT "<$element>".$cl->{$element}."</$element>\n";
         }
         for my $element (qw(
@@ -554,7 +554,7 @@
             note
             note_title
             )) {
-            next unless $cl->{"$element"};
+            next unless defined($cl->{"$element"});
             print OUT "<$element>";
             printq(\*OUT,$cl->{"$element"});
             print OUT "</$element>\n";
@@ -670,7 +670,7 @@
             load_diff_files($lab_log);
         }
         load_command_lines($Config{"input"}, $Config{"input_mask"});
-        sort_command_lines;
+        #sort_command_lines;
         #process_command_lines;
         print_command_lines($Config{"cache"});
     } 
@@ -729,8 +729,8 @@
             load_cache_stat();
             load_command_lines($Config{"input"}, $Config{"input_mask"});
             if (@Command_Lines) {
-                sort_command_lines;
-                process_command_lines;
+                #sort_command_lines;
+                #process_command_lines;
                 print_command_lines($Config{"cache"});
             }
             save_cache_stat();
diff -r 3326053f9b23 -r b7a217f8e963 l3scripts
--- a/l3scripts	Fri Jan 27 09:04:44 2006 +0200
+++ b/l3scripts	Fri Jan 27 09:53:10 2006 +0200
@@ -1,5 +1,6 @@
 ###install
-cat $sshkey | $lmssh $ssh_user@$host /bin/sh -c '"mkdir -p ~/.ssh; cat >>~/.ssh/authorized_keys; chmod 600 ~/.ssh/authorized_keys"'
+$lmssh $ssh_user@$host /bin/sh -c '"mkdir -p ~/.ssh"'
+cat $sshkey | $lmssh $ssh_user@$host /bin/sh -c '"cat >>~/.ssh/authorized_keys; chmod 600 ~/.ssh/authorized_keys"'
 
 ###install-lm
 cat $lminstall | ssh $ssh_user@$host /bin/sh -s $dirs
@@ -8,7 +9,7 @@
 ###install-pm
 scp PM/* $ssh_user@$host:/tmp
 ssh $ssh_user@$host 'cd /tmp; tar xfz Term-VT102*.gz; cd Term-VT102*[^z]; perl Makefile.PL; make ; make install'
-#ssh $ssh_user@$host 'cd /tmp; tar xfz Text-Iconv*.gz; cd Text-Iconv*[^z]; perl Makefile.PL; make ; make install'
+ssh $ssh_user@$host 'cd /tmp; tar xfz Text-Iconv*.gz; cd Text-Iconv*[^z]; perl Makefile.PL; make ; make install'
 
 ###copy-lablogs
 for i in $dirs
diff -r 3326053f9b23 -r b7a217f8e963 lm-install
--- a/lm-install	Fri Jan 27 09:04:44 2006 +0200
+++ b/lm-install	Fri Jan 27 09:53:10 2006 +0200
@@ -35,14 +35,14 @@
 install_to_profile()
 {
 	profile=$1
-	cat $profile \
-		| sed '/LabMaker:START/,/LabMaker:END/ d' \
-		> $temp_file
-	cat <<'LM_bash_profile' >> $temp_file
+	cat <<'LM_bash_profile' > $temp_file
 # LabMaker:START
 /usr/local/bin/l3-agent
 # LabMaker:END
 LM_bash_profile
+	cat $profile \
+		| sed '/LabMaker:START/,/LabMaker:END/ d' \
+		>> $temp_file
 	cat $temp_file > $profile
 	rm $temp_file
 }
@@ -100,6 +100,7 @@
 <local_session_id>$session_id</local_session_id>
 <hostname>$hostname</hostname>
 <user>$USER</user>
+<uid>$UID</uid>
 <login_from>$login_from</login_from>
 <tty>$tty</tty>
 <system>$system</system>