Merge branch 'devel' into uefi

Fast Foward

8 files changed, 27 insertions, 8 deletions

diff --git a/admin/Database/ogAdmBD-1.1.0-1.1.1.sql b/admin/Database/ogAdmBD-1.1.0-1.1.1.sql
new file mode 120000
index 00000000..fd52f3c8
--- /dev/null
+++ b/admin/Database/ogAdmBD-1.1.0-1.1.1.sql
@@ -0,0 +1 @@
+ogAdmBD-1.1.0a-1.1.1.sql
\ No newline at end of file
diff --git a/admin/Database/ogAdmBD-1.1.0a-1.1.1pre.sql b/admin/Database/ogAdmBD-1.1.0a-1.1.1.sql
index d0b3e0a7..d0b3e0a7 100644
--- a/admin/Database/ogAdmBD-1.1.0a-1.1.1pre.sql
+++ b/admin/Database/ogAdmBD-1.1.0a-1.1.1.sql
diff --git a/admin/Database/ogAdmBD-1.1.1pre.sql b/admin/Database/ogAdmBD-1.1.1pre-1.1.1.sql
index d10e2e5d..2d54e3a9 100644
--- a/admin/Database/ogAdmBD-1.1.1pre.sql
+++ b/admin/Database/ogAdmBD-1.1.1pre-1.1.1.sql
@@ -1,5 +1,5 @@
 ### Fichero de actualización de la base de datos.
-# OpenGnsys 1.1.1
+# OpenGnsys 1.1.1pre - OpenGnsys 1.1.1
 #use ogAdmBD
 
 # Eliminar procedimiento y disparador para evitar errores de ejecución.
diff --git a/admin/Sources/Clients/ogagent/windows/build-windows.sh b/admin/Sources/Clients/ogagent/windows/build-windows.sh
index d7248ab7..88a3c4ed 100755
--- a/admin/Sources/Clients/ogagent/windows/build-windows.sh
+++ b/admin/Sources/Clients/ogagent/windows/build-windows.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
+cd "$(dirname "$0")"
 export WINEARCH=win32
-export WINEPREFIX=$(realpath $(dirname $0)/wine)
+export WINEPREFIX=$PWD/wine
+grep -o "[0-9]*\.[0-9]*\.[0-9]*" ../src/VERSION > VERSION
 wine cmd /c c:\\ogagent\\build.bat
-chmod -x $(dirname $0)/../OGAgentSetup*.exe
+chmod -x ../OGAgentSetup*.exe
diff --git a/admin/Sources/Clients/ogagent/windows/ogagent.nsi b/admin/Sources/Clients/ogagent/windows/ogagent.nsi
index 88c9ab2f..8caf6738 100644
--- a/admin/Sources/Clients/ogagent/windows/ogagent.nsi
+++ b/admin/Sources/Clients/ogagent/windows/ogagent.nsi
@@ -2,12 +2,17 @@
 # Copy inside the two x86_xxxxx folders inside nsis plugins folder

 Name "OpenGnsys Agent"

 

-# OpenGnsys Actor version

+# OpenGnsys Agent version

 !define /file OGA_VERSION "src\VERSION"

+!define /file OGA_WINVERSION "windows\VERSION"

 

 # General Symbol Definitions

 !define REGKEY "SOFTWARE\OGAgent"

-!define VERSION ${OGA_VERSION}.0

+!if ${OGA_VERSION} == ${OGA_WINVERSION}

+  !define VERSION ${OGA_WINVERSION}.0

+!else

+  !define VERSION ${OGA_WINVERSION}.1

+!endif

 !define COMPANY "OpenGnsys Project"

 !define URL https://opengnsys.es

 

diff --git a/doc/VERSION.json b/doc/VERSION.json
index d9d28325..1d1910c0 100644
--- a/doc/VERSION.json
+++ b/doc/VERSION.json
@@ -1,6 +1,6 @@
 {
   "project": "OpenGnsys",
-  "version": "1.1.1pre",
+  "version": "1.1.1",
   "codename": "Espeto",
   "definition": "http://www.andalucia.com/gastronomy/espeto.htm",
   "release": ""
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index 2894b801..43d987e6 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -52,10 +52,21 @@ function userData ()
 	DEFAULT_OPENGNSYS_DB_USER="usuog"		# Usuario por defecto de acceso a la base de datos
 	DEFAULT_OPENGNSYS_DB_PASSWD="passusuog"		# Clave por defecto de acceso a la base de datos
 	DEFAULT_OPENGNSYS_CLIENT_PASSWD="og"		# Clave por defecto de acceso del cliente	
+	DEFAULT_OGLIVE="ogLive-bionic-5.0.0-15-generic-amd64-r20190515.97b8472.iso "	# Cliente ogLive
 
 	echo -e "\\nOpenGnsys Installation"
 	echo "=============================="
 
+	if [[ $- =~ s ]]; then
+		echo -e "\\nNot interactive mode: setting default configuration values.\\n"
+		MYSQL_ROOT_PASSWORD="$DEFAULT_MYSQL_ROOT_PASSWORD"
+		OPENGNSYS_DB_USER="$DEFAULT_OPENGNSYS_DB_USER"
+		OPENGNSYS_DB_PASSWD="$DEFAULT_OPENGNSYS_DB_PASSWD"
+		OPENGNSYS_CLIENT_PASSWD="$DEFAULT_OPENGNSYS_CLIENT_PASSWD"
+		OGLIVE="$DEFAULT_OGLIVE"
+		return
+	fi
+
 	# Clave root de MySQL
 	echo -n -e "\\nEnter root password for MySQL (${DEFAULT_MYSQL_ROOT_PASSWORD}): "
 	enterPassword "$DEFAULT_MYSQL_ROOT_PASSWORD"
@@ -178,7 +189,7 @@ OSVERSION="${OSVERSION%%.*}"
 # Configuración según la distribución GNU/Linux (usar minúsculas).
 case "$OSDISTRIB" in
 	ubuntu|debian|linuxmint)
-		DEPENDENCIES=( subversion apache2 php php-ldap php-fpm mysql-server php-mysql isc-dhcp-server bittorrent tftp-hpa tftpd-hpa xinetd build-essential g++-multilib libmysqlclient-dev wget curl doxygen graphviz bittornado ctorrent samba rsync unzip netpipes debootstrap schroot squashfs-tools btrfs-tools procps arp-scan realpath php-curl gettext moreutils jq udpcast libev-dev shim-signed grub-efi-amd64-signed )
+		DEPENDENCIES=( subversion apache2 php php-ldap php-fpm mysql-server php-mysql isc-dhcp-server bittorrent tftp-hpa tftpd-hpa xinetd build-essential g++-multilib libmysqlclient-dev wget curl doxygen graphviz bittornado ctorrent samba rsync unzip netpipes debootstrap schroot squashfs-tools btrfs-tools procps arp-scan realpath php-curl gettext moreutils jq udpcast libev-dev libjansson-dev shim-signed grub-efi-amd64-signed )
 		UPDATEPKGLIST="apt-get update"
 		INSTALLPKG="apt-get -y install --force-yes"
 		CHECKPKG="dpkg -s \$package 2>/dev/null | grep Status | grep -qw install"
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index 826e9b89..d16b2697 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -118,7 +118,7 @@ function autoConfigure()
 	# Configuración según la distribución de Linux.
 	if [ -f /etc/debian_version ]; then
 		# Distribución basada en paquetes Deb.
-		DEPENDENCIES=( curl rsync btrfs-tools procps arp-scan realpath php-curl gettext moreutils jq udpcast libev-dev shim-signed grub-efi-amd64-signed php-fpm )
+		DEPENDENCIES=( curl rsync btrfs-tools procps arp-scan realpath php-curl gettext moreutils jq udpcast libev-dev libjansson-dev shim-signed grub-efi-amd64-signed php-fpm )
 		# Paquete correcto para realpath.
 		[ -z "$(apt-cache pkgnames realpath)" ] && DEPENDENCIES=( ${DEPENDENCIES[@]//realpath/coreutils} )
 		UPDATEPKGLIST="add-apt-repository -y ppa:ondrej/php; apt-get update"