diff options
| -rwxr-xr-x[-rw-r--r--] | client/engine/UEFI.lib | 0 | ||||
| -rw-r--r-- | doc/CHANGELOG.es.txt | 12 | ||||
| -rw-r--r-- | doc/VERSION.json | 4 | ||||
| -rwxr-xr-x | installer/opengnsys_update.sh | 14 | ||||
| -rw-r--r-- | installer/vagrant/Vagrantfile-1.1.1c-vbox (renamed from installer/vagrant/Vagrantfile-1.1.1b-vbox) | 2 | ||||
| l--------- | installer/vagrant/Vagrantfile-prod-vbox | 2 | ||||
| -rwxr-xr-x | repoman/bin/deletepreimage | 26 | ||||
| -rwxr-xr-x | repoman/bin/torrent-tracker | 3 |
8 files changed, 31 insertions, 32 deletions
diff --git a/client/engine/UEFI.lib b/client/engine/UEFI.lib index 1a8bb952..1a8bb952 100644..100755 --- a/client/engine/UEFI.lib +++ b/client/engine/UEFI.lib diff --git a/doc/CHANGELOG.es.txt b/doc/CHANGELOG.es.txt index 5a716e47..5fd812c8 100644 --- a/doc/CHANGELOG.es.txt +++ b/doc/CHANGELOG.es.txt @@ -3,6 +3,16 @@ LISTA DE CAMBIOS CHANGELOG.es.txt ======================================== +Lista de cambios incluidos en OpenGnsys 1.1.1c (versión de mantenimiento) +---------------------------------------------- + +Tickets resueltos en módulo OpenGnsys Installer: +#943 Elegir versión a la que se quiere actualizar + +Tickets genéricos resueltos: +#983 Liberar versión de mantenimiento OpenGnsys 1.1.1c + + Lista de cambios incluidos en OpenGnsys 1.1.1b (versión de mantenimiento) ---------------------------------------------- @@ -41,6 +51,7 @@ Tickets resueltos en módulo OpenGnsys Installer: Tickets genéricos resueltos: #959 Liberar versión de mantenimiento OpenGnsys 1.1.1b + Lista de cambios incluidos en OpenGnsys 1.1.1a (versión de mantenimiento) ---------------------------------------------- @@ -58,7 +69,6 @@ Tickets resueltos en módulo OpenGnsys Web Admin Console: #949 Mostrar datos de sesiones de sistemas operativos en propiedades de ordenador Tickets resueltos en módulo OpenGnsys Installer: -#943 Elegir versión a la que se quiere actualizar #945 Script de importación no guarda los triggers de la base de datos (corrección) #950 GitHub ya no permite obtener la copia de trabajo con Subversion (corrección) #951 Posible problema al actualizar la base de datos con MySQL en modo estricto (corrección) diff --git a/doc/VERSION.json b/doc/VERSION.json index 34189592..13d23c33 100644 --- a/doc/VERSION.json +++ b/doc/VERSION.json @@ -1,7 +1,7 @@ { "project": "OpenGnsys", "version": "1.1.1c", - "codename": "", - "definition": "", + "codename": "Espeto", + "definition": "http://www.andalucia.com/gastronomy/espeto.htm", "release": "" } diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index b4159795..aa981c0a 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -182,7 +182,7 @@ function autoConfigure() # Choose an available version to update. function chooseVersion() { - local RELEASES DOWNLOADS INSTVERSION INSTRELEASE + local RELEASES DOWNLOADS INSTVERSION INSTRELEASE RELDATE # Development branch. BRANCH="master" @@ -197,10 +197,10 @@ function chooseVersion() # Fetch tags (releases) data from GitHub. while read -pe TAG URL; do if [[ $TAG =~ ^opengnsys- ]]; then - [ "${TAG#opengnsys-}" \< "${INSTVERSION%pre}" ] && break - RELEASES+=( "${TAG}" ) - DOWNLOADS+=( "$URL" ) - #RELDATE=$(curl -s "$URL" | jq -r '.commit.committer.date | split("-") | join("")[:8]') + [ "${TAG#opengnsys-}" \< "${INSTVERSION%pre}" ] && continue + RELDATE=$(curl -s "$URL" | jq -r '.commit.committer.date | split("-") | join("")[:8]') + RELEASES+=( "${TAG} ($RELDATE)" ) + DOWNLOADS+=( "$URL" ) fi done <<< $(curl -s "$API_URL/../../tags" | jq -r '.[] | .name+" "+.commit.url') # Add development (master) branch. @@ -210,10 +210,10 @@ function chooseVersion() if [ ${#RELEASES[@]} -gt 1 ]; then echo "Installed version: $INSTVERSION $INSTRELEASE" echo "Versions available for update (\"$BRANCH\" is the latest development branch):" - PS3="Enter a number: " + PS3="Enter a number (CTRL-C to exit): " select opt in "${RELEASES[@]}"; do if [ -n "$opt" ]; then - BRANCH="$opt" + BRANCH="${opt%% *}" API_URL="${DOWNLOADS[REPLY-1]}" break fi diff --git a/installer/vagrant/Vagrantfile-1.1.1b-vbox b/installer/vagrant/Vagrantfile-1.1.1c-vbox index cfcb7da6..7db7b8f5 100644 --- a/installer/vagrant/Vagrantfile-1.1.1b-vbox +++ b/installer/vagrant/Vagrantfile-1.1.1c-vbox @@ -4,7 +4,7 @@ VAGRANTFILE_API_VERSION = "2" # VM provider: Oracle VM VirtualBox. ENV['VAGRANT_DEFAULT_PROVIDER'] = "virtualbox" # OpenGnsys version and OGAgent version. -OGVERSION="1.1.1b" +OGVERSION="1.1.1c" # Language (accepted values: es_ES, ca_ES, en_GB). LANGUAGE = "es_ES" ENV['LC_ALL'] = LANGUAGE + ".UTF-8" diff --git a/installer/vagrant/Vagrantfile-prod-vbox b/installer/vagrant/Vagrantfile-prod-vbox index 3fdb0e39..0d1bf07b 120000 --- a/installer/vagrant/Vagrantfile-prod-vbox +++ b/installer/vagrant/Vagrantfile-prod-vbox @@ -1 +1 @@ -Vagrantfile-1.1.1b-vbox
\ No newline at end of file +Vagrantfile-1.1.1c-vbox
\ No newline at end of file diff --git a/repoman/bin/deletepreimage b/repoman/bin/deletepreimage index 19d6f2c7..faeb8e58 100755 --- a/repoman/bin/deletepreimage +++ b/repoman/bin/deletepreimage @@ -21,34 +21,24 @@ LOGFILE="$OPENGNSYS/log/$PROG.log" # Procesar ficheros de imágenes. trap 'echo "`date` : Proceso interrumpido" >> $LOGFILE; exit ' 1 2 3 6 9 15 -#TODO en LOCAL: si existe algún fichero *.delete lo movemos al repositorio -ls $OPENGNSYS/www/tmp/*.delete &>/dev/null || (checkrepo; exit) -mv $OPENGNSYS/www/tmp/*.* $OGIMG +shopt -s nullglob +TODELETE=( $OPENGNSYS/www/tmp/*.delete ) -#TODO: iniciar blucle siempre y cuando haya algun delete -ls /opt/opengnsys/images/*.delete &>/dev/null || exit -for IMG in `ls $OGIMG/*.delete`; do +for IMG in ${TODELETE[@]##*/}; do # Obtenemos el nombre de la imagen - DELETEIMAGE=$(echo ${IMG%%.*} | awk -F"$OGIMG/" '{print $2}') - - # Borramos marca .delete para que el próximo cron no trabaje sobre este conjunto. - [ -f $IMG ] && rm $IMG - - ## Comprobamos si es una imagen de backup - DELETEant=$(echo $IMG | awk -F"." '{print $3}') ## .ant - + DELETEIMAGE="${IMG%%.*}" ## Si la imagen es un backup se añade la extensión ant - if [[ $DELETEant == "ant" ]]; then - DELETEIMAGE=$DELETEIMAGE".ant" - fi + [ "${IMG##*.}" == "ant" ] && DELETEIMAGE+=".ant" + ## si directorio:imagen cambiamos : por / DELETEIMAGE=$(echo $DELETEIMAGE|tr : /) ## se llama al escript de borrado de imagen. deleteimage $DELETEIMAGE - done +# Eliminar marcas de borrado. +rm -f ${TODELETE[@]} # Actualizar información del repositorio. checkrepo diff --git a/repoman/bin/torrent-tracker b/repoman/bin/torrent-tracker index 7a0ac7ae..36f8b192 100755 --- a/repoman/bin/torrent-tracker +++ b/repoman/bin/torrent-tracker @@ -16,7 +16,6 @@ BTSEEDERPID="/var/run/btseeder.pid" ################### ####################################### pkill bttrack -rm $BTTRACKDFILE +rm -f $BTTRACKDFILE sleep 2 bttrack $BTTRACK_OPTIONS &>> $BTTRACKLOG & -ps aux | grep bttrack | grep -v grep | awk -F: '{print $3}' |