#840: Continuar sustitución de SVN por Git.

5 files changed, 33 insertions, 20 deletions

diff --git a/doc/INSTALL.en.txt b/doc/INSTALL.en.txt
index 4eef6920..732ffea4 100644
--- a/doc/INSTALL.en.txt
+++ b/doc/INSTALL.en.txt
@@ -1,10 +1,10 @@
-Installing OpenGnsys Server v 1.0.5
-=======================================
+Installing OpenGnsys Server v 1.1.1
+===================================
 
 Before installation
 -------------------
 
-OpenGnsys Server 1.0.5 is meant to be installed under Ubuntu Server 12.04 LTS or newer, though it has also been tested under operating systems based on Fedora 20
+OpenGnsys Server 1.1.1 is meant to be installed under Ubuntu Server 16.04 LTS or newer, though it has also been tested under operating systems based on CentOS 7.
 
 Network connection is needed in order to download the required packages, the source code and the preconfigured client.
 
@@ -17,19 +17,19 @@ Minimum storage requirements:
 Installation
 ------------
 
-To install OpenGnsys, run opengnsys_installer.sh after unpacking the release file (opengnsys-release.tar.gz) o downloading it directly from https://opengnsys.es/svn/trunk/installer/opengnsys_installer.sh.
+To install OpenGnsys, run opengnsys_installer.sh after unpacking the release file (opengnsys-release.tar.gz) o downloading it directly from https://raw.githubusercontent.com/opengnsys/OpenGnsys/devel/installer/opengnsys_installer.sh
 
 Unpacking example:
-	tar xvzf opengnsys-1.0.5.tar.gz
+	tar xvzf opengnsys-1.1.0.tar.gz
 	cd opengnsys/installer
 
 Download examples:
 
     * Download with wget.
-	wget https://opengnsys.es/svn/trunk/installer/opengnsys_installer.sh -O opengnsys_installer.sh
+	wget https://raw.githubusercontent.com/opengnsys/OpenGnsys/devel/installer/opengnsys_installer.sh
 
     * Download with curl.
-	curl https://opengnsys.es/svn/trunk/installer/opengnsys_installer.sh > opengnsys_installer.sh
+	curl https://raw.githubusercontent.com/opengnsys/OpenGnsys/devel/installer/opengnsys_installer.sh -o opengnsys_installer.sh
 
 
 You must be root to run the installation script:
diff --git a/doc/INSTALL.es.txt b/doc/INSTALL.es.txt
index 4cc54344..d18bc5c6 100644
--- a/doc/INSTALL.es.txt
+++ b/doc/INSTALL.es.txt
@@ -1,10 +1,10 @@
-Instalación de OpenGnsys Server v 1.1.0
+Instalación de OpenGnsys Server v 1.1.1
 =======================================
 
 Notas iniciales
 ---------------
 
-Se presupone que el servidor de OpenGnsys va a ser instalado en una distribución del sistema operativo Ubuntu Server a partir de la versión 14.04 LTS (también ha sido probado en sistemas basados en CentOS 7).
+Se presupone que el servidor de OpenGnsys va a ser instalado en una distribución del sistema operativo Ubuntu Server a partir de la versión 16.04 LTS (también ha sido probado en sistemas basados en CentOS 7).
 
 El serividor debe tener acceso a Internet para descargar los paquetes necesarios, el código del proyecto y el cliente preconfigurado.
 
@@ -18,20 +18,20 @@ Requisitos mínimos de almacenamiento:
 Instalación
 -----------
 
-La instalación de OpenGnsys se realiza ejecutando el script de instalación opengnsys_installer.sh, el cual puede obtenerse descomprimiendo el fichero de la versión opengnsys-Version.tar.gz o descargándolo directamente de la dirección: https://opengnsys.es/svn/branches/version1.1/installer/opengnsys_installer.sh
+La instalación de OpenGnsys se realiza ejecutando el script de instalación opengnsys_installer.sh, el cual puede obtenerse descomprimiendo el fichero de la versión opengnsys-Version.tar.gz o descargándolo directamente de la dirección: https://raw.githubusercontent.com/opengnsys/OpenGnsys/devel/installer/opengnsys_installer.sh
 
 Ejemplos de descompresión del programa:
 
-	tar xvzf opengnsys-1.0.5.tar.gz
+	tar xvzf opengnsys-1.1.0.tar.gz
 	cd opengnsys/installer
 
 Ejemplos de descarga con varias herramientas:
 
     * Descargar con wget.
-	wget https://opengnsys.es/svn/branches/version1.1/installer/opengnsys_installer.sh -O opengnsys_installer.sh
+	wget https://raw.githubusercontent.com/opengnsys/OpenGnsys/devel/installer/opengnsys_installer.sh
 
     * Descargar con curl.
-	curl https://opengnsys.es/svn/branches/version1.1/installer/opengnsys_installer.sh > opengnsys_installer.sh
+	curl https://raw.githubusercontent.com/opengnsys/OpenGnsys/devel/installer/opengnsys_installer.sh -o opengnsys_installer.sh
 
 
 El script de instalación debe ser ejecutado como usuario root:
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index ba6b0bf2..fb852fa9 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -1204,7 +1204,7 @@ function createDirs()
 	echoAndLog "${FUNCNAME}(): creating directory paths in $path_opengnsys_base"
 	mkdir -p $path_opengnsys_base
 	mkdir -p $path_opengnsys_base/bin
-	mkdir -p $path_opengnsys_base/client/{images,log}
+	mkdir -p $path_opengnsys_base/client/{cache,images,log}
 	mkdir -p $path_opengnsys_base/doc
 	mkdir -p $path_opengnsys_base/etc
 	mkdir -p $path_opengnsys_base/lib
diff --git a/installer/opengnsys_makecompress.sh b/installer/opengnsys_makecompress.sh
index ab05b5ce..0fbec746 100755
--- a/installer/opengnsys_makecompress.sh
+++ b/installer/opengnsys_makecompress.sh
@@ -7,28 +7,41 @@
 # Versión:	1.0 - Incluido en OpenGnSys 1.0.1
 # Autor:	Ramón Gómez, Universidad de Sevilla
 # Fecha:	10/05/2011
+# Versión:	1.1.1 - Descarga desde repositorio de GitHub
+# Autor:	Ramón Gómez, Universidad de Sevilla
+# Fecha:	27/05/2018
+
 
+# Comprobaciones.
+for PROG in jq unzip; do
+    if ! which $PROG &>/dev/null; then
+        echo "Please, install \"$PROG\" package."
+        exit 1
+    fi
+done
 
 # Variables
-SVNURL="https://opengnsys.es/svn/branches/version1.1/"
-SVNREV=$(LANG=C svn info $SVNURL | awk '/Last Changed Rev:/ {print "r"$4}')
+BRANCH="devel"
+CODE_URL="https://codeload.github.com/opengnsys/OpenGnsys/zip/$BRANCH"
+API_URL="https://api.github.com/repos/opengnsys/OpenGnsys/branches/$BRANCH"
+REVISION=$(curl -s "$API_URL" | jq -r ".commit.commit.committer.date" | awk '{gsub(/[^0-9]/,""); print}')
 
 # Descargar repositorio SVN
 cd /tmp
 rm -fr opengnsys
-svn export $SVNURL opengnsys || exit 1
+curl "$CODE_URL" -o opengnsys.zip && unzip opengnsys.zip && mv "OpenGnsys-$BRANCH" opengnsys
 
 # Asisgnar propietario de los ficheros descargados.
 chown -R root.root opengnsys
 WARNING=$?
 
 # Parchear datos de revisión del código.
-perl -pi -e "s/$/ $SVNREV/" opengnsys/doc/VERSION.txt
+perl -pi -e "s/$/ $REVISION/" opengnsys/doc/VERSION.txt
 
 # Generar fichero comprimido.
 VERSION=$(awk '{print $2"-"$3}' opengnsys/doc/VERSION.txt)
 tar cvzf opengnsys-$VERSION.tar.gz opengnsys
-rm -fr opengnsys
+rm -fr opengnsys opengnsys.zip
 
 # Revisar salida.
 [ $WARNING != 0 ] && echo "*** WARNING: cannot change owner of files to \"root\" user before compressing."
diff --git a/installer/vagrant/Vagrantfile-ogagent-vbox b/installer/vagrant/Vagrantfile-ogagent-vbox
index 22ddfe54..9e909973 100644
--- a/installer/vagrant/Vagrantfile-ogagent-vbox
+++ b/installer/vagrant/Vagrantfile-ogagent-vbox
@@ -33,7 +33,7 @@ wget -q https://atom.io/download/rpm -O /tmp/atom.rpm && dnf install -y /tmp/ato
 # Comment out next line if you prefer to install Eclipse IDE for Python (it needs more disk space).
 #dnf install -y eclipse-pydev eclipse-nls-${LANG%_*}
 # Download OGAgent environment installer.
-svn export https://opengnsys.es/svn/branches/version1.1/installer/ogagent-devel-installer.sh /home/vagrant
+wget -q https://raw.githubusercontent.com/opengnsys/OpenGnsys/devel/installer/ogagent-devel-installer.sh -O /home/vagrant/ogagent-devel-installer.sh
 # Instructions.
 echo "Manual operations:"
 echo "- Reboot VM or launch desktop: startxfce4 &"