--- loncom/html/adm/geogebra/commands	2012/08/17 22:52:24	1.1
+++ loncom/html/adm/geogebra/commands	2024/05/31 02:07:02	1.6
@@ -1,16 +1,70 @@
-currversion=0.0
-if [ -e "$1/VERSION" ]
+currversion='0.0.0'
+webdir='/home/httpd/html/adm/geogebra/web'
+cssdir='/home/httpd/html/adm/geogebra/css'
+if [ -e $webdir ]
 then
-  currversion=`cat $1/VERSION`
+    if [ -e "$webdir/VERSION" ]
+    then
+        currversion=`cat $webdir/VERSION`
+    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
-  rm -rf $1/
-  tar -xvf geogebra_html5.tar.gz
-  mv web $1
-  cp VERSION $1/VERSION
-  chown -R www:www $1
-  find $1 -type d -exec chmod u=rwx,go-rwx {} \;
+  if [ -e $webdir ]
+  then
+      rm -rf $webdir
+      if [ -e "$webdir/geogebra_html5.tar.gz" ]
+      then
+          rm "$webdir/geogebra_html5.tar.gz"
+      fi
+  fi
+  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 {} \;
+  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.2.843.tar.gz"
+  fi
+  sleep 1
 fi