From d4479c117ce240b00ca78845f646ed4e1c5b2411 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 12 Feb 2016 11:27:22 +0100 Subject: [PATCH] openmamba-netsrpms: only run curl to check version for specified component, not all --- SRPMSVERSIONS | 30 +++++++++++++++++++---------- SRPMSVERSIONS.arm | 2 +- openmamba-update/openmamba-netsrpms | 3 ++- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/SRPMSVERSIONS b/SRPMSVERSIONS index 1519467..0d46664 100644 --- a/SRPMSVERSIONS +++ b/SRPMSVERSIONS @@ -2,14 +2,18 @@ SRPMVERSION["b43-firmware"]=4.150.10.5 SRPMRELEASE["b43-firmware"]=1mamba # flashplugin -SRPMVERSION["flashplugin"]="`curl --max-time 20 -s http://www.adobe.com/software/flash/about/ | grep -A2 "Linux" | tail -n1 | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`" -SRPMRELEASE["flashplugin"]=1mamba +if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "flashplugin" ]; then + SRPMVERSION["flashplugin"]="`curl --max-time 20 -s http://www.adobe.com/software/flash/about/ | grep -A2 "Linux" | tail -n1 | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`" + SRPMRELEASE["flashplugin"]=1mamba +fi # msttcorefonts SRPMVERSION["msttcorefonts"]=1.3 SRPMRELEASE["msttcorefonts"]=7mamba # skype -SRPMVERSION["skype"]="`curl --max-time 20 -sLI "http://www.skype.com/go/getskype-linux-beta-dynamic"|grep "linux/skype-"|sed "s|.*skype-\(.*\)\.tar\..*|\1|"|grep -v "\.\.0\." 2>/dev/null`" -SRPMRELEASE["skype"]=2mamba +if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "skype" ]; then + SRPMVERSION["skype"]="`curl --max-time 20 -sLI "http://www.skype.com/go/getskype-linux-beta-dynamic"|grep "linux/skype-"|sed "s|.*skype-\(.*\)\.tar\..*|\1|"|grep -v "\.\.0\." 2>/dev/null`" + SRPMRELEASE["skype"]=2mamba +fi # spotify if [ "`uname -m`" == "x86_64" ]; then SRPMVERSION["spotify"]=20150629 @@ -18,14 +22,20 @@ SRPMVERSION["spotify"]=0 fi SRPMRELEASE["spotify"]=1mamba # sun-java7 -SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`" -SRPMRELEASE["sun-java7"]=1mamba +if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java7" ]; then + SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`" + SRPMRELEASE["sun-java7"]=1mamba +fi # virtualbox-extension-pack -SRPMVERSION["virtualbox-extension-pack"]="`rpm -q VirtualBox 2>/dev/null| cut -d- -f2`" -SRPMRELEASE["virtualbox-extension-pack"]=1mamba +if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "virtualbox-extension-pack" ]; then + SRPMVERSION["virtualbox-extension-pack"]="`rpm -q VirtualBox 2>/dev/null| cut -d- -f2`" + SRPMRELEASE["virtualbox-extension-pack"]=1mamba +fi # win32codecs SRPMVERSION["win32codecs"]=20110131 SRPMRELEASE["win32codecs"]=1mamba # chromium-pepper-flash -SRPMVERSION["chromium-pepper-flash"]="`curl --max-time 20 -s "http://googlechromereleases.blogspot.it/" | grep -i -m 1 "stable channel has been updated to" | sed "s|.*updated to \([0-9.]*\) .*|\1|" 2>/dev/null`" -SRPMRELEASE["chromium-pepper-flash"]=1mamba +if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "chromium-pepper-flash" ]; then + SRPMVERSION["chromium-pepper-flash"]="`curl --max-time 20 -s "http://googlechromereleases.blogspot.it/" | grep -i -m 1 "stable channel has been updated to" | sed "s|.*updated to \([0-9.]*\) .*|\1|" 2>/dev/null`" + SRPMRELEASE["chromium-pepper-flash"]=1mamba +fi diff --git a/SRPMSVERSIONS.arm b/SRPMSVERSIONS.arm index 694d5c1..baf4654 100644 --- a/SRPMSVERSIONS.arm +++ b/SRPMSVERSIONS.arm @@ -1,2 +1,2 @@ -SRPMVERSION["sun-java7"]="`curl -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`" +SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`" SRPMRELEASE["sun-java7"]=1mamba diff --git a/openmamba-update/openmamba-netsrpms b/openmamba-update/openmamba-netsrpms index 599281b..b7e70e2 100755 --- a/openmamba-update/openmamba-netsrpms +++ b/openmamba-update/openmamba-netsrpms @@ -44,9 +44,10 @@ function check_if_already_installed() { } declare -A SRPMVERSION SRPMRELEASE -. /etc/sysconfig/netsrpminstall || exit 1 for pckname in $PACKAGES; do + export SRPMCHECK="$pckname" + . /etc/sysconfig/netsrpminstall || exit 1 SRPM_PATH=$DISTRO_SRPMS_DIR/${pckname} SPEC_PATHNAME=$SRPM_PATH/${pckname}.spec