lilalo

diff lm @ 8:56e8b17b1823

lm-install поправлен.
* Исправлено вычисление имени пользователя
для chown ~/.labmaker после инсталляции.
* Ничего не добавляется в профайл, всё чере basrhc
* PS1 меняется до exec
author devi
date Sun May 29 12:40:51 2005 +0300 (2005-05-29)
parents 7d4d067f9823
children 35f394563dcb
line diff
     1.1 --- a/lm	Tue May 24 13:56:12 2005 +0300
     1.2 +++ b/lm	Sun May 29 12:40:51 2005 +0300
     1.3 @@ -336,7 +336,8 @@
     1.4  	for my $student (@{$XMLClass->{"student"}}) {
     1.5  		my $user = $student->{"user"};
     1.6  		my $hostname = $student->{"host"};
     1.7 -		my $encoding = $student->{"encoding"};
     1.8 +		my $encoding = $student->{"charset"};
     1.9 +		my $student_name = $student->{"firstname"}." ".$student->{"surname"};
    1.10  
    1.11  		system("mkdir -p $webdir/$date/$hostname");
    1.12  		system("cp ".$Config{"path_share"}."/*.{ico,css} $webdir/$date/$hostname");
    1.13 @@ -345,12 +346,24 @@
    1.14  			" --diffs ".$Config{"path_lablogs"}."/$course/$date/$hostname/$user ".
    1.15  				   $Config{"path_lablogs"}."/$course/$date/$hostname/root".
    1.16  			" --output $webdir/$date/$hostname/$user.html".
    1.17 +			" --course-name '$course_name'".
    1.18 +			" --course-code '$course'".
    1.19 +			" --course-date '$date'".
    1.20 +			" --course-center '$center'".
    1.21 +			" --course-student '$student_name'".
    1.22 +			" --course-trainer '$instructor'".
    1.23  			" --encoding $encoding"
    1.24  		);
    1.25  		system($Config{"l3-report"}.
    1.26  			" --input ".$Config{"path_lablogs"}."/$course/$date/$hostname/root".
    1.27  			" --diffs ".$Config{"path_lablogs"}."/$course/$date/$hostname/root ".
    1.28  			" --output $webdir/$date/$hostname/root.html".
    1.29 +			" --course-name '$course_name'".
    1.30 +			" --course-code '$course'".
    1.31 +			" --course-date '$date'".
    1.32 +			" --course-center '$center'".
    1.33 +			" --course-student '$student_name'".
    1.34 +			" --course-trainer '$instructor'".
    1.35  			" --encoding $encoding"
    1.36  		);
    1.37  	}