--- loncom/build/install_web_site_cronjob	2004/07/06 15:44:07	1.8
+++ loncom/build/install_web_site_cronjob	2012/01/28 22:46:26	1.10
@@ -50,10 +50,10 @@ with perl.
 # the "make tardist" command.  But instead, unstable is now defined as
 # "all the gunk we have been working on", whereas the 
 # "make tardist" command means a "carefully inventoried selection of gunk".
-#`cd /home/loninst/auto; export CVS_PASSFILE=/home/loninst/.cvspass; export CVSROOT=:pserver:scott\@localhost:/home/cvs; rm -Rf loncapa/[C][^V]*; rm -Rf loncapa/[^C]*; cvs -Q co loncapa; cd loncapa/loncom/build; make build 2>/dev/null; make tardist;`;
+#`cd /home/loninst/auto; export CVS_RSH=ssh; export CVSROOT=:ext:loninst\@source.lon-capa.org:/home/cvs; rm -Rf loncapa/[C][^V]*; rm -Rf loncapa/[^C]*; cvs -Q co loncapa; cd loncapa/loncom/build; make build 2>/dev/null; make tardist;`;
 
 # The real world.  Just give them all the gunk for the unstable distribution.
-`cd /home/loninst/auto; export CVS_PASSFILE=/home/loninst/.cvspass; export CVSROOT=:pserver:scott\@localhost:/home/cvs; rm -Rf loncapa-unstable; rm -Rf loncapa; cvs -Q export -r HEAD loncapa;`;
+`cd /home/loninst/auto; export CVS_RSH=ssh; export CVSROOT=:ext:loninst\@source.lon-capa.org:/home/cvs; rm -Rf loncapa-unstable; rm -Rf loncapa; cvs -Q export -r HEAD loncapa;`;
 
 # Generate a README file that advises them about dealing with the gunk.
 open(OUT,'>/home/loninst/auto/loncapa/README');
@@ -97,10 +97,17 @@ close(OUT);
 `cd /home/loninst/auto; ln -s loncapa loncapa-unstable; tar cvvf loncapa-unstable.tar loncapa-unstable/* ;gzip -9 -f loncapa-unstable.tar`;
 
 # ---------------------------------------- Dynamically generating documentation
-`cd /home/loninst/auto/loncapa/loncom/build; make pdfdoc`;
-`cd /home/loninst/auto/loncapa/loncom/build; make doc`;
-`cd /home/loninst/auto/loncapa/loncom/build; cp docs.tar.gz /home/loninst/public_html/docs/.`;
-`cd /home/loninst/public_html/docs; tar xzf docs.tar.gz`;
+
+system("rm /home/loninst/public_html/*html");
+
+# pdf and doc targets are borken right now
+#`cd /home/loninst/auto/loncapa/loncom/build; make pdfdoc`;
+#`cd /home/loninst/auto/loncapa/loncom/build; make doc`;
+#`cd /home/loninst/auto/loncapa/loncom/build; cp docs.tar.gz /home/loninst/public_html/docs/.`;
+#`cd /home/loninst/public_html/docs; tar xzf docs.tar.gz`;
+
+`cd /home/loninst/auto/loncapa/loncom/build; make buildwebsite`;
+system("cp /home/loninst/auto/loncapa/doc/build/*.html /home/loninst/public_html/");
 
 # ------------------------------------ Copying over the latest unstable tarball
 #my $filename=`cd /home/loninst/auto; find loncapa -type f -name *.tar.gz -maxdepth 1`;
@@ -120,7 +127,7 @@ my $releasedate = <IN>;
 close(IN);
 
 # ------------------ Updating the download page with the date of the last build
-open(IN,"</home/loninst/public_html/docs/downloads/index.html");
+open(IN,"</home/loninst/public_html/index.html");
 my @lines = <IN>;
 close(IN);
 my $date = `date -I`; chomp($date);
@@ -128,7 +135,7 @@ my $text = join('',@lines);
 $text =~ s/loncapa-unstable\.tar\.gz\<\/a\>.*?\./loncapa-unstable\.tar\.gz\<\/a\> (generated $date)\./;
 $text =~ s/LATESTVERSION/$version/g;
 $text =~ s/LATESTDATE/$releasedate/g;
-open(OUT,">/home/loninst/public_html/docs/downloads/index.html");
+open(OUT,">/home/loninst/public_html/index.html");
 print(OUT $text);
 close(OUT);
 
@@ -142,7 +149,7 @@ open(IN,"</home/loninst/public_html/vers
 my $releasedate = <IN>;
 close(IN);
 # -------------- Updating the download page with the date of the last build
-open(IN,"</home/loninst/public_html/docs/downloads/index.html");
+open(IN,"</home/loninst/public_html/index.html");
 my @lines = <IN>;
 close(IN);
 my $text = join('',@lines);
@@ -152,8 +159,9 @@ if ($version) {
     $text =~ s/TESTINGRELEASE_START//g;
     $text =~ s/TESTINGRELEASE_END//g;
 } else {
-    $text =~ s/TESTINGRELEASE_START.*TESTINGRELEASE_END//g;
+    $text =~ s/TESTINGRELEASE_START.*TESTINGRELEASE_END//gs;
 }
-open(OUT,">/home/loninst/public_html/docs/downloads/index.html");
+open(OUT,">/home/loninst/public_html/index.html");
 print(OUT $text);
 close(OUT);
+