Mejoras varias para al seleccionar que version usar

berris · Mar 23, 2016 · 0903b65 · 0903b65
1 parent eaee66b
commit 0903b65
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 21 deletions.
diff --git a/Multimedia/brasero_updater b/Multimedia/brasero_updater
@@ -2,7 +2,7 @@
 
 # Script by www.seguridadwireless.net
 
-SCRIPT_VERSION=20151117
+SCRIPT_VERSION=20160322
 CATEGORIA=Grabacion
 
 ############################################################
@@ -19,12 +19,12 @@ f_variables(){
 F_variables() {
 	PRGNAM=brasero
 	echo -ne "\033]2;${PRGNAM}_updater\007"
-	WEB=https://download.gnome.org/sources/brasero/
-	RAMA=`curl -s $WEB | grep DIR | tail -1 | cut -d "=" -f5 | cut -d '"' -f2 | cut -d "/" -f1`
-	VERSION=`curl -s ${WEB}${RAMA}/ | grep LATEST | cut -d '"' -f8 | sed "s/LATEST-IS-//g" | sed "s/ //g"`
+	WEB=https://download.gnome.org/sources/$PRGNAM
+	RAMA=`curl -s $WEB/|egrep -o ">[0-9].[0-9]{1,2}/"|tr -d '>/'|egrep -v "1$|3$|5$|7$|9$"|tail -1`
+	VERSION=`curl -s ${WEB}/${RAMA}/|egrep -o "IS-$RAMA.[0-9]{1,2}"|cut -d- -f2|tail -1`
 	EXTENSION=tar.xz
 	SOURCES=$PRGNAM-$VERSION.$EXTENSION
-	DOWNLOAD=https://download.gnome.org/sources/brasero/$RAMA/$SOURCES
+	DOWNLOAD=$WEB/$RAMA/$SOURCES
 }
 
 # Comprobar dependencias

diff --git a/Python/py3gobject3_updater b/Python/py3gobject3_updater
@@ -2,7 +2,7 @@
 
 # Script by www.seguridadwireless.net
 
-SCRIPT_VERSION=20160221
+SCRIPT_VERSION=20160323
 
 ############################################################
 ## Funciones comunes. Su nombre empieza por f_ ##
@@ -19,12 +19,12 @@ F_variables() {
 	PRGNAM=py3gobject3
 	SRCNAM=pygobject
 	echo -ne "\033]2;${PRGNAM}_updater\007"
-	WEB=http://ftp.gnome.org/pub/gnome/sources/$SRCNAM/
-	RAMA=`curl -s $WEB|grep [0-9]/|tail -1|cut -d '>' -f3|cut -d / -f-1`
-	VERSION=`curl -s ${WEB}${RAMA}/|grep LATEST-IS|cut -d- -f3|cut -d '"' -f-1`
+	WEB=http://ftp.gnome.org/pub/gnome/sources/$SRCNAM
+	RAMA=`curl -s $WEB/|egrep -o ">[0-9].[0-9]{1,2}/"|tr -d '>/'|egrep -v "1$|3$|5$|7$|9$"|tail -1`
+	VERSION=`curl -s ${WEB}/${RAMA}/|egrep -o "IS-$RAMA.[0-9]{1,2}"|cut -d- -f2|tail -1`
 	EXTENSION=tar.xz
 	SOURCES=$SRCNAM-$VERSION.$EXTENSION
-	DOWNLOAD=http://ftp.gnome.org/pub/gnome/sources/$SRCNAM/$RAMA/$SOURCES
+	DOWNLOAD=$WEB/$RAMA/$SOURCES
 }
 
 # Comprobar dependencias

diff --git a/Sistema/wine_updater b/Sistema/wine_updater
@@ -2,7 +2,7 @@
 
 # Script by www.seguridadwireless.net
 
-SCRIPT_VERSION=20160211
+SCRIPT_VERSION=20160323
 
 #################################################
 ## Funciones comunes. Su nombre empieza por f_ ##
@@ -19,7 +19,7 @@ F_variables(){
 	PRGNAM=wine
 	echo -ne "\033]2;${PRGNAM}_updater\007"
 	WEB=https://sourceforge.net/projects/wine/files/Slackware%20Packages/
-	VERSION=$(curl -s $WEB | grep -m1 "class=\"folder" | awk '{print $2}' | cut -d "\"" -f 2)
+	VERSION=$(curl -s $WEB|grep -m1 "class=\"folder"|awk '{print $2}'|cut -d "\"" -f 2)
 	GECKO_WEB=https://sourceforge.net/projects/wine/files/Wine%20Gecko/
 	GECKO_VERSION=$(curl -s $GECKO_WEB | grep -m1 "class=\"folder" | awk '{print $2}' | cut -d "\"" -f 2)
 	MONO_WEB=https://sourceforge.net/projects/wine/files/Wine%20Mono/
@@ -28,25 +28,33 @@ F_variables(){
 
 # Si el paquete no existe se descargara de internet
 F_download(){
-	if [ ! -f $PRGNAM-$VERSION-$ARCH-1sg.txz ]; then
+	BUILD=`curl -s ${WEB}$VERSION/$ARCH/|grep -o [0-9]sg|tail -1`
+	DESCARGAR="wget -N -L -c -q --show-progress"
+	if [ $ARCH = i586 ]; then
+	ARCH=i486
+	SYSTEM=x86
+	else
+	SYSTEM=$(uname -m)
+	fi
+	if [ ! -f $PRGNAM-$VERSION-$ARCH-$BUILD.txz ]; then
 	echo ""
 	echo "$CYAN"Descargando sources de $PRGNAM-$VERSION"$CIERRE"
 	sleep 1
-	aria2c -x 3 ${WEB}$VERSION/$ARCH/$PRGNAM-$VERSION-$ARCH-1sg.txz
+	$DESCARGAR ${WEB}$VERSION/$ARCH/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
 	fi
 # Si gecko no existe se descargara de internet
-	if [ ! -f ${PRGNAM}_gecko-$GECKO_VERSION-x86.msi ]; then
+	if [ ! -f ${PRGNAM}_gecko-$GECKO_VERSION-$SYSTEM.msi ]; then
 	echo ""
-	echo "$CYAN"Descargando plugin ${PRGNAM}_gecko-$GECKO_VERSION-x86.msi"$CIERRE"
+	echo "$CYAN"Descargando plugin ${PRGNAM}_gecko-$GECKO_VERSION-$SYSTEM.msi"$CIERRE"
 	sleep 1
-	aria2c -x 3 $GECKO_WEB/$GECKO_VERSION/${PRGNAM}_gecko-$GECKO_VERSION-x86.msi
+	$DESCARGAR $GECKO_WEB/$GECKO_VERSION/${PRGNAM}_gecko-$GECKO_VERSION-$SYSTEM.msi
 	fi
 # Si mono no existe se descargara de internet
 	if [ ! -f ${PRGNAM}-mono-$MONO_VERSION.msi ]; then
 	echo ""
 	echo "$CYAN"Descargando plugin ${PRGNAM}-mono-$MONO_VERSION.msi"$CIERRE"
 	sleep 1
-	aria2c -x 3 $MONO_WEB/$MONO_VERSION/${PRGNAM}-mono-$MONO_VERSION.msi
+	$DESCARGAR $MONO_WEB/$MONO_VERSION/${PRGNAM}-mono-$MONO_VERSION.msi
 fi
 }
 
@@ -56,7 +64,7 @@ echo ""
 echo "$VERDE"
 txz2dir $PRGNAM-$VERSION-$ARCH-1sg.txz $PKG
 mkdir $PKG/usr/share/wine/gecko $PKG/usr/share/wine/mono
-mv ${PRGNAM}_gecko-$GECKO_VERSION-x86.msi $PKG/usr/share/wine/gecko
+mv ${PRGNAM}_gecko-$GECKO_VERSION-$SYSTEM.msi $PKG/usr/share/wine/gecko
 mv ${PRGNAM}-mono-$MONO_VERSION.msi $PKG/usr/share/wine/mono
 rm $PKG/var/log/packages/wine*
 # El desktop winecfg viene mal ..se repara
@@ -74,7 +82,7 @@ Type=Application
 " > $PKG/usr/share/applications/winecfg.desktop
 
 # Se da permiso de ejecucion a los plugins
-chmod 777 $PKG/usr/share/wine/gecko/${PRGNAM}_gecko-$GECKO_VERSION-x86.msi
+chmod 777 $PKG/usr/share/wine/gecko/${PRGNAM}_gecko-$GECKO_VERSION-$SYSTEM.msi
 chmod 777 $PKG/usr/share/wine/mono/${PRGNAM}-mono-$MONO_VERSION.msi
 }
 
@@ -97,7 +105,7 @@ f_presentacion
 #Comprobamos updates del script
 f_comprobarUpdates
 #Asignamos o detectamos arquitectura
-f_arquitectura i486
+f_arquitectura
 #Comprobamos version instalada del script
 f_versionInstalada
 #Si no existe el fichero se descargara