--- loncom/build/lpml_parse.pl	2007/01/25 22:54:25	1.54
+++ loncom/build/lpml_parse.pl	2014/06/09 05:14:12	1.61
@@ -12,7 +12,7 @@
 # The LearningOnline Network with CAPA
 # lpml_parse.pl - Linux Packaging Markup Language parser
 #
-# $Id: lpml_parse.pl,v 1.54 2007/01/25 22:54:25 raeburn Exp $
+# $Id: lpml_parse.pl,v 1.61 2014/06/09 05:14:12 raeburn Exp $
 #
 # Written by Scott Harrison, codeharrison@yahoo.com
 #
@@ -86,6 +86,7 @@ Usage is for lpml file to come in throug
     typical choices: default,redhat6.2,debian2.2,redhat7
 4th argument is to manually specify a sourceroot.
 5th argument is to manually specify a targetroot.
+6th argument is to manually specify a shell.
 
 Only the 1st argument is mandatory for the program to run.
 
@@ -100,7 +101,7 @@ END
 # ------------------------------------------------- Grab command line arguments
 
 my $mode='';
-if (@ARGV==5) {
+if (@ARGV == 6 || @ARGV == 5) {
     $mode = shift @ARGV;
 }
 else {
@@ -135,6 +136,11 @@ $targetroot=~s/\/$//; # remove trailing
 $sourcerootarg=$sourceroot;
 $targetrootarg=$targetroot;
 
+my $shell = 'sh';
+if (@ARGV) {
+    $shell = shift @ARGV;
+}
+
 my $logcmd='| tee -a WARNINGS';
 
 my $invocation; # Record how the program was invoked
@@ -147,6 +153,7 @@ if ($mode eq 'install' or $mode eq 'conf
 #             3rd argument (distribution) is: $dist
 #             4th argument (sourceroot) is: described below
 #             5th argument (targetroot) is: described below
+#             6th argument (shell) is: $shell	
 END
 }
 
@@ -1151,11 +1158,11 @@ sub format_files {
 	    $tword=''; $tword=' alwaysrun' if $trigger eq 'always run'; 
 	    if ($command!~/\s/) {
 		$command=~s/\/([^\/]*)$//;
-		$command2="cd $command; sh ./$1;\\";
+		$command2="cd $command; $shell ./$1;\\";
 	    }
 	    else {
 		$command=~s/(.*?\/)([^\/]+\s+.*)$/$1/;
-		$command2="cd $command; sh ./$2;\\";
+		$command2="cd $command; $shell ./$2;\\";
 	    }
 	    my $depstring;
 	    my $depstring2="\t\t\@echo '';\\\n";
@@ -1223,6 +1230,7 @@ sub format_file {
     my @tokeninfo=@_;
     $file=''; $source=''; $target=''; $categoryname=''; $description='';
     $note=''; $build=''; $status=''; $dependencies=''; $installscript='';
+    $buildlink = '';
     my $text=&trim($parser->get_text('/file'));
     my $buildtest;
     $file_count++;
@@ -1266,14 +1274,15 @@ sub format_file {
 #		"$build $status $dependencies" .
 #		"\nEND FILE");
 	}
-	elsif ($mode eq 'install' && $categoryname ne 'conf') {
+	elsif (($mode eq 'install') && (($categoryname ne 'conf') && 
+					($categoryname ne 'www conf'))) {
 	    if ($build) {
 		my $bi=$sourceroot.'/'.$source.';'.$build.';'.
 		    $dependencies;
 		my ($source2,$command,$trigger,@deps)=split(/\;/,$bi);
 		$tword=''; $tword=' alwaysrun' if $trigger eq 'always run'; 
 		$command=~s/\/([^\/]*)$//;
-		$command2="cd $command; sh ./$1;\\";
+		$command2="cd $command; $shell ./$1;\\";
 		my $depstring;
 		foreach my $dep (@deps) {
 		    $depstring.=<<END;
@@ -1297,37 +1306,69 @@ END
                 $buildtest.=<<END;
 	fi
 END
-	    }
+            }
 	    if ($installscript) {
 		my $dir = $sourceroot.'/'.$source;
 		$dir =~ s|/([^/]*)$||;
-		return <<"END";
-$buildtest	cd $dir ; sh $installscript\\
-		chmod -R $categoryhash{chmod.$categoryname} ${targetroot}/${target} \\
-		chown -R $categoryhash{chown.$categoryname} ${targetroot}/${target} \\
+		my $result =" 
+$buildtest	cd $dir ; $shell $installscript";
+		if ($categoryname 
+		    && exists($categoryhash{"chmod.$categoryname"}) ) {
+		    $result .="\\\n";
+		    $result .=<<"END"
+		chmod -R $categoryhash{"chmod.$categoryname"} ${targetroot}/${target} \\
+		chown -R $categoryhash{"chown.$categoryname"} ${targetroot}/${target} 
 END
+                } else {
+		    $result.="\n";
+		}
+		return $result;
 	    }
-            my $bflag='-b1';
-            $bflag='-b3' if $dependencies or $buildlink;
-	    return <<END;
+            my $bflag='-b5';
+            $bflag='-b3' if ($buildlink);
+            $bflag='-b6' if (($dependencies) or
+                             ($categoryname eq 'pdf manual'));
+	    if ($tokeninfo[2]{type} eq 'private') {
+		return <<END;
+$buildtest	\@if (test -e "${sourceroot}/${source}") && (test -e "${targetroot}/${target}"); then \\
+		ECODE=0; \\
+		perl filecompare.pl $bflag ${sourceroot}/${source} ${targetroot}/${target} || ECODE=\$\$?; \\
+		case "\$\$ECODE" in \\
+			1) echo "${targetroot}/${target} is unchanged";; \\
+			2) echo "**** WARNING **** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
+			0) echo "install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
+                esac; \\
+	elif (test -e "${sourceroot}/${source}") && !(test -e "${targetroot}/${target}"); then\\
+		echo "install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}; \\
+	fi
+	\@if (test -e "${targetroot}/${target}"); then \\
+		perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
+	fi
+END
+            } else {
+	        return <<END;
 $buildtest	\@if !(test -e "${sourceroot}/${source}") && !(test -e "${targetroot}/${target}"); then \\
 		echo "**** ERROR **** CVS source file does not exist: ${sourceroot}/${source} and neither does target: ${targetroot}/${target}"$logcmd; \\
 	elif !(test -e "${sourceroot}/${source}"); then \\
 		echo "**** WARNING **** CVS source file does not exist: ${sourceroot}/${source}"$logcmd; \\
 		perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
+	elif !(test -e "${targetroot}/${target}"); then \\
+		echo "install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}; \\
 	else \\
 		ECODE=0; \\
 		perl filecompare.pl $bflag ${sourceroot}/${source} ${targetroot}/${target} || ECODE=\$\$?; \\
 		case "\$\$ECODE" in \\
 			1) echo "${targetroot}/${target} is unchanged";; \\
-			2) echo "**** WARNING **** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
-			0) echo "install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
+			2) echo "**** WARNING **** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
+			0) echo "install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
 		esac; \\
 		perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
 	fi
 END
+            }
 	}
-	elsif ($mode eq 'configinstall' && $categoryname eq 'conf') {
+	elsif ($mode eq 'configinstall' && (($categoryname eq 'conf') ||
+					    ($categoryname eq 'www conf'))) {
 	    push @configall,$targetroot.'/'.$target;
 	    return $targetroot.'/'.$target.': alwaysrun'."\n".
 		"\t".'@# Compare source with target and intelligently respond'.
@@ -1516,7 +1557,7 @@ sub format_fileglob {
 	    if ($glob eq '*') {
 		$eglob='[^C][^V][^S]'.$glob;
 	    }
-	    return "\t".'install '.
+	    return "\t".'install -p '.
 		$categoryhash{$categoryname}.' '.
 		$sourceroot.'/'.$sourcedir.$eglob.' '.
 		$targetroot.'/'.$targetdir.'.'."\n";
@@ -1623,11 +1664,12 @@ sub format_installscript {
 # -------------------------------------------------------- Format build section
 sub format_buildlink {
     my @tokeninfo=@_;
-    $buildlink='';
     my $text=&trim($parser->get_text('/buildlink'));
     if ($text) {
 	$parser->get_tag('/buildlink');
 	$buildlink=$sourceroot.'/'.$text;
+    } else {
+        $buildlink='';
     }
     return '';
 }
@@ -1645,12 +1687,13 @@ sub format_status {
 # ------------------------------------------------- Format dependencies section
 sub format_dependencies {
     my @tokeninfo=@_;
-    #$dependencies='';
     my $text=&trim($parser->get_text('/dependencies'));
     if ($text) {
 	$parser->get_tag('/dependencies');
 	$dependencies=join(';',((map {s/^\s*//;s/\s$//;$_} split(/\;/,$text)),$dependencies));
 	$dependencies=~s/;$//;
+    } else {
+        $dependencies='';
     }
     return '';
 }