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

[raeburn]

raeburn		Fri May 31 02:07:06 2024 EDT

  Modified files:              
    /loncom/html/adm/geogebra	VERSION commands 
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - Geogebra for HTML5 for functionplotresponse 
    Update to version 5.2.843 (requires functionplotresponse.pm rev. 1.111)
  
  
Index: loncom/html/adm/geogebra/VERSION
diff -u loncom/html/adm/geogebra/VERSION:1.4 loncom/html/adm/geogebra/VERSION:1.5
--- loncom/html/adm/geogebra/VERSION:1.4	Sat Apr  4 23:21:56 2015
+++ loncom/html/adm/geogebra/VERSION	Fri May 31 02:07:02 2024
@@ -1 +1 @@
-5.0
+5.2.843
Index: loncom/html/adm/geogebra/commands
diff -u loncom/html/adm/geogebra/commands:1.5 loncom/html/adm/geogebra/commands:1.6
--- loncom/html/adm/geogebra/commands:1.5	Sat Apr  4 23:21:56 2015
+++ loncom/html/adm/geogebra/commands	Fri May 31 02:07:02 2024
@@ -1,5 +1,6 @@
-currversion=0.0
+currversion='0.0.0'
 webdir='/home/httpd/html/adm/geogebra/web'
+cssdir='/home/httpd/html/adm/geogebra/css'
 if [ -e $webdir ]
 then
     if [ -e "$webdir/VERSION" ]
@@ -8,10 +9,40 @@
     fi
 fi
 newversion=`cat VERSION`
-comparison=`echo "$newversion > $currversion" | bc`
+arrnewversion=(${newversion//./ })
+arrnewlength=${#arrnewversion[@]}
+arrnewcomp=`echo "$arrnewlength < 3" | bc`
+if [ $arrnewcomp -gt 0 ]
+then
+    arrnewversion[2]=0;
+fi
+arrcurrversion=(${currversion//./ })
+arrcurrlength=${#arrcurrversion[@]}
+arrcurrcomp=`echo "$arrcurrlength < 3" | bc`
+if [ $arrcurrcomp -gt 0 ]
+then
+    arrcurrversion[2]=0;
+fi
+comparison=`echo "${arrnewversion[0]} > ${arrcurrversion[0]}" | bc`
+if [ $comparison -eq 0 ]
+then
+  comparison=`echo "${arrnewversion[0]} < ${arrcurrversion[0]}" | bc`
+  if [ $comparison -eq 0 ]
+  then
+    comparison=`echo "${arrnewversion[1]} > ${arrcurrversion[1]}" | bc`
+    if [ $comparison -eq 0 ]
+    then
+      comparison=`echo "${arrnewversion[1]} < ${arrcurrversion[1]}" | bc`
+      if [ $comparison -eq 0 ]
+      then
+        comparison=`echo "${arrnewversion[2]} > ${arrcurrversion[2]}" | bc`
+      fi
+    fi
+  fi
+fi
 if [ $comparison -gt 0 ]
 then
-  if [ -e $webdir ] 
+  if [ -e $webdir ]
   then
       rm -rf $webdir
       if [ -e "$webdir/geogebra_html5.tar.gz" ]
@@ -19,14 +50,21 @@
           rm "$webdir/geogebra_html5.tar.gz"
       fi
   fi
-  tar -xzf geogebraweb_5.0.tar.gz
+  if [ -e $cssdir ]
+  then
+      rm -rf $cssdir
+  fi
+  tar -xzf geogebraweb_5.2.843.tar.gz
   mv web $webdir
+  mv css $cssdir
   cp VERSION $webdir/VERSION
   chown -R www:www $webdir
   find $webdir -type d -exec chmod u=rwx,go-rwx {} \;
-  if [ -e "$webdir/geogebraweb_5.0.tar.gz" ]
+  chown -R www:www $cssdir
+  find $cssdir -type d -exec chmod u=rwx,go-rwx {} \;
+  if [ -e "$webdir/geogebraweb_5.2.843.tar.gz" ]
   then
-      rm "$webdir/geogebraweb_5.0.tar.gz"
+      rm "$webdir/geogebraweb_5.2.843.tar.gz"
   fi
   sleep 1
 fi
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.1063 doc/loncapafiles/loncapafiles.lpml:1.1064
--- doc/loncapafiles/loncapafiles.lpml:1.1063	Mon May 27 13:37:19 2024
+++ doc/loncapafiles/loncapafiles.lpml	Fri May 31 02:07:05 2024
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.1063 2024/05/27 13:37:19 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.1064 2024/05/31 02:07:05 raeburn Exp $ -->
 
 <!--
 
@@ -5149,8 +5149,8 @@
 </file>
 
 <file>
-  <source>loncom/html/adm/geogebra/geogebraweb_5.0.tar.gz</source>
-  <target dist='default'>home/httpd/html/adm/geogebra/web</target>
+  <source>loncom/html/adm/geogebra/geogebraweb_5.2.843.tar.gz</source>
+  <target dist='default'>home/httpd/html/adm/geogebra</target>
   <categoryname>script</categoryname>
   <description>
    HTML5/JavaScript Version of GeoGebra
@@ -5161,7 +5161,7 @@
   <dependencies>
 loncom/html/adm/geogebra/commands;
 loncom/html/adm/geogebra/VERSION;
-loncom/html/adm/geogebra/geogebraweb_5.0.tar.gz;
+loncom/html/adm/geogebra/geogebraweb_5.2.843.tar.gz;
   </dependencies>
 </file>