diff options
| author | ramon <ramongomez@us.es> | 2018-03-01 09:51:09 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2018-03-01 09:51:09 +0000 |
| commit | 1635f45168894e07e2efb4a2bc12cbea9f62f4e3 (patch) | |
| tree | fdebc7a9d08bf2ddff15a5ed8dd49eadd54e2b2e | |
| parent | bddacadcd4802b555e295e11f6393f059eeecd90 (diff) | |
#804: Dejar de instalar antigua librería xajax incompatible con PHP 7.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5626 a21b9725-9963-47de-94b9-378ad31fedc9
| -rw-r--r-- | admin/xajax_0.5_standard.zip | bin | 241376 -> 0 bytes | |||
| -rwxr-xr-x | installer/opengnsys_installer.sh | 4 | ||||
| -rwxr-xr-x | installer/opengnsys_update.sh | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/admin/xajax_0.5_standard.zip b/admin/xajax_0.5_standard.zip Binary files differdeleted file mode 100644 index d247c280..00000000 --- a/admin/xajax_0.5_standard.zip +++ /dev/null diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index bf933220..96fd0737 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -1065,7 +1065,6 @@ function dhcpConfigure() function installWebFiles() { local COMPATDIR f - local XAJAXFILE="xajax_0.5_standard.zip" local SLIMFILE="slim-2.6.1.zip" local SWAGGERFILE="swagger-ui-2.2.5.zip" @@ -1078,8 +1077,7 @@ function installWebFiles() fi find $INSTALL_TARGET/www -name .svn -type d -exec rm -fr {} \; 2>/dev/null - # Descomprimir librerías: XAJAX, Slim y Swagger-UI. - unzip -o $WORKDIR/opengnsys/admin/$XAJAXFILE -d $INSTALL_TARGET/www/xajax + # Descomprimir librerías: Slim y Swagger-UI. unzip -o $WORKDIR/opengnsys/admin/$SLIMFILE -d $INSTALL_TARGET/www/rest unzip -o $WORKDIR/opengnsys/admin/$SWAGGERFILE -d $INSTALL_TARGET/www/rest diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index 5a27e837..556e06ef 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -590,7 +590,7 @@ function updateWebFiles() rsync --exclude .svn -irplt $WORKDIR/opengnsys/admin/WebConsole $INSTALL_TARGET ERRCODE=$? mv $INSTALL_TARGET/WebConsole $INSTALL_TARGET/www - unzip -o $WORKDIR/opengnsys/admin/xajax_0.5_standard.zip -d $INSTALL_TARGET/www/xajax + rm -fr $INSTALL_TARGET/www/xajax unzip -o $WORKDIR/opengnsys/admin/slim-2.6.1.zip -d $INSTALL_TARGET/www/rest unzip -o $WORKDIR/opengnsys/admin/swagger-ui-2.2.5.zip -d $INSTALL_TARGET/www/rest if [ $ERRCODE != 0 ]; then |