[LON-CAPA-cvs] cvs: doc /loncapafiles loncapafiles.lpml loncom/html/adm/ckeditor VERSION commands

[raeburn]

raeburn		Thu Jul 18 00:40:12 2013 EDT

  Added files:                 
    /loncom/html/adm/ckeditor	VERSION 

  Modified files:              
    /loncom/html/adm/ckeditor	commands 
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - Include ckeditor version information.
    - Only install when running ./UPDATE if ckeditor is absent, or if a newer
      version is included in LON-CAPA tarball.
    - Correction to target location for ckeditor directory in loncapafiles.lpml
    - Remove unused /home/httpd/htmladm/ckeditor directory 
  
  
Index: loncom/html/adm/ckeditor/commands
diff -u loncom/html/adm/ckeditor/commands:1.5 loncom/html/adm/ckeditor/commands:1.6
--- loncom/html/adm/ckeditor/commands:1.5	Tue Jul 16 14:14:51 2013
+++ loncom/html/adm/ckeditor/commands	Thu Jul 18 00:40:07 2013
@@ -1,5 +1,29 @@
 path=`pwd`
 htmldir='/home/httpd/html'
+currversion=3.62
+ckeditordir="$htmldir/ckeditor"
+if [ -e $ckeditordir ]
+then
+  if [ -e "$ckeditordir/VERSION" ]
+  then
+      currversion=`cat $ckeditordir/VERSION`
+  fi
+fi
+newversion=`cat VERSION`
+comparison=`echo "$newversion > $currversion" | bc`
+if [ $comparison -gt 0 ]
+then
+  if [ -e $ckeditordir ]
+  then
+    rm -rf $ckeditordir
+  fi
+  cd $htmldir
+  echo $path/ckeditor_3.6.6.1.tar.gz
+  tar -zxf $path/ckeditor_3.6.6.1.tar.gz
+  cp $path/VERSION ckeditor/VERSION
+  cp $path/loncapaconfig.js ckeditor/loncapaconfig.js
+  chown -R www:www ckeditor
+fi
 if [ -e "$htmldir/fckeditor" ]
 then
     rm -rf $htmldir/fckeditor
@@ -8,7 +32,7 @@
 then
     rm -rf $htmldir/htmlarea
 fi
-cd $htmldir
-echo $path/ckeditor_3.6.6.1.tar.gz
-tar -zxf $path/ckeditor_3.6.6.1.tar.gz
-cp $path/loncapaconfig.js ckeditor/loncapaconfig.js
+if  [ -e "$htmldir/adm/ckeditor" ]
+then
+    rm -rf $htmldir/adm/ckeditor
+fi
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.841 doc/loncapafiles/loncapafiles.lpml:1.842
--- doc/loncapafiles/loncapafiles.lpml:1.841	Wed Jul 17 13:28:32 2013
+++ doc/loncapafiles/loncapafiles.lpml	Thu Jul 18 00:40:12 2013
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.841 2013/07/17 13:28:32 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.842 2013/07/18 00:40:12 raeburn Exp $ -->
 
 <!--
 
@@ -607,7 +607,7 @@
 </directory>
 <directory dist='default'>
   <protectionlevel>modest_delete</protectionlevel>
-  <targetdir dist='default'>home/httpd/html/adm/ckeditor</targetdir>
+  <targetdir dist='default'>home/httpd/html/ckeditor</targetdir>
   <categoryname>server readonly</categoryname>
   <description>Rich Text Editor</description>
 </directory>
@@ -4697,7 +4697,7 @@
 
 <file>
   <source>loncom/html/adm/ckeditor/ckeditor_3.6.6.1.tar.gz</source>
-  <target dist='default'>home/httpd/html/adm/ckeditor</target>
+  <target dist='default'>home/httpd/html/ckeditor</target>
   <categoryname>script</categoryname>
   <description>
    GUI HTML Editor, scripted installation decompress the tarball and
@@ -4710,6 +4710,7 @@
 loncom/html/adm/ckeditor/commands;
 loncom/html/adm/ckeditor/ckeditor_3.6.6.1.tar.gz;
 loncom/html/adm/ckeditor/loncapaconfig.js;
+loncom/html/adm/ckeditor/VERSION;
   </dependencies>
 </file>