diff options
| -rw-r--r-- | admin/xajax_0.5_standard.zip | bin | 0 -> 241376 bytes | |||
| -rwxr-xr-x | installer/pkg-generator/genpkg.sh | 3 | ||||
| -rwxr-xr-x | installer/pkg-generator/tmp/opengnsys_installer/opengnsys_git_update.sh | 14 |
3 files changed, 11 insertions, 6 deletions
diff --git a/admin/xajax_0.5_standard.zip b/admin/xajax_0.5_standard.zip Binary files differnew file mode 100644 index 00000000..d247c280 --- /dev/null +++ b/admin/xajax_0.5_standard.zip diff --git a/installer/pkg-generator/genpkg.sh b/installer/pkg-generator/genpkg.sh index 535cf921..bbea3365 100755 --- a/installer/pkg-generator/genpkg.sh +++ b/installer/pkg-generator/genpkg.sh @@ -411,6 +411,9 @@ mkdir -p $WORKDIR $ROOTDIR $INSTALL_TARGET #downloadCode $CODE_URL # for testing and development: git clone gituser@opengnsys.es:/git/opengnsys -b $DEV_BRANCH $WORKDIR +# for local testing and development: +#cp -a /home/fredy/opgn/git-repo/* $WORKDIR + mkdir -p $ROOTDIR/DEBIAN $ROOTDIR/tmp echoAndLog "Copying $WORKDIR/pkg-generator/* to $ROOTDIR" cp -a $WORKDIR/installer/pkg-generator/* $ROOTDIR diff --git a/installer/pkg-generator/tmp/opengnsys_installer/opengnsys_git_update.sh b/installer/pkg-generator/tmp/opengnsys_installer/opengnsys_git_update.sh index a08e05a0..b086c95e 100755 --- a/installer/pkg-generator/tmp/opengnsys_installer/opengnsys_git_update.sh +++ b/installer/pkg-generator/tmp/opengnsys_installer/opengnsys_git_update.sh @@ -487,14 +487,14 @@ function updateWebFiles() # Copiar los ficheros nuevos conservando el archivo de configuración de acceso. backupFile $INSTALL_TARGET/www/controlacceso.php - #~ mv $INSTALL_TARGET/www $INSTALL_TARGET/WebConsole - #~ rsync -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 + mv $INSTALL_TARGET/www $INSTALL_TARGET/WebConsole + rsync -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 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 + if [ "$ERRCODE" != 0 ]; then errorAndLog "${FUNCNAME}(): Error updating web files." exit 1 fi @@ -524,6 +524,8 @@ function updateWebFiles() # Copiar ficheros en la zona de descargas de OpenGnsys Web Console. function updateDownloadableFiles() { + #DEBUG + return 0 local FILENAME=ogagentpkgs-$NEWVERSION.tar.gz local TARGETFILE=$WORKDIR/$FILENAME |