From 065e45bff6ac791350ffc0a434ae4c0452585959 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Wed, 11 May 2011 12:24:47 +0200
Subject: update installer FIX #765 update suse distroinfo helper script update
 suse distroinfo FIX #733

---
 tools/installer             |  7 ++++-
 tools/updateDistroInfo.suse | 77 ++++++++++++++++++++++++++-------------------
 2 files changed, 50 insertions(+), 34 deletions(-)

(limited to 'tools')

diff --git a/tools/installer b/tools/installer
index 6010b1e2..f974c82c 100755
--- a/tools/installer
+++ b/tools/installer
@@ -5,7 +5,12 @@
 
 
 # determin distribution
-DISTRO=$(lsb_release -i| sed 's/^[^:]*:\t//' | tr '[:upper:]' '[:lower:]')
+if [ ! -z $(which lsb_release) ]; then
+  DISTRO=$(lsb_release -i| sed 's/^[^:]*:\t//' | tr '[:upper:]' '[:lower:]')
+else
+  # Can't determin distro version..
+  DISTRO=""
+fi
 
 # get/set default paths
 [ -z $USR_BIN_PATH ]       && USR_BIN_PATH=/usr/bin
diff --git a/tools/updateDistroInfo.suse b/tools/updateDistroInfo.suse
index b877ab55..ddc8a0b8 100755
--- a/tools/updateDistroInfo.suse
+++ b/tools/updateDistroInfo.suse
@@ -27,36 +27,36 @@ use Net::FTP;
 # Configuration ###############################################################
 
 my @supportedVersions = (
-    {
-        ver => 
-            '10.3',
-        source => 
-            'http://mirrors.opensuse.org/list/all.html',
-        supporedArch => 
-            'i586 x86_64',
-        packageKeysLocation => 
-            'http://download.opensuse.org/distribution/10.3/repo/oss/'
-    },
-    {
-        ver => 
-            '11.0',
-        source => 
-            'http://mirrors.opensuse.org/list/11.0.html',
-        supporedArch => 
-            'i586 x86_64',
-        packageKeysLocation => 
-            'http://download.opensuse.org/distribution/11.0/repo/oss/'
-    },
-    {
-        ver => 
-            '11.1',
-        source => 
-            'http://mirrors.opensuse.org/list/11.1.html',
-        supporedArch => 
-            'i586 x86_64',
-        packageKeysLocation => 
-            'http://download.opensuse.org/distribution/11.1/repo/oss/'
-    }
+#    {
+#        ver => 
+#            '10.3',
+#        source => 
+#            'http://mirrors.opensuse.org/list/all.html',
+#        supporedArch => 
+#            'i586 x86_64',
+#        packageKeysLocation => 
+#            'http://download.opensuse.org/distribution/10.3/repo/oss/'
+#    },
+#    {
+#        ver => 
+#            '11.0',
+#        source => 
+#            'http://mirrors.opensuse.org/list/11.0.html',
+#        supporedArch => 
+#            'i586 x86_64',
+#        packageKeysLocation => 
+#            'http://download.opensuse.org/distribution/11.0/repo/oss/'
+#    },
+#    {
+#        ver => 
+#            '11.1',
+#        source => 
+#            'http://mirrors.opensuse.org/list/11.1.html',
+#        supporedArch => 
+#            'i586 x86_64',
+#        packageKeysLocation => 
+#            'http://download.opensuse.org/distribution/11.1/repo/oss/'
+#    },
     {
         ver => 
             '11.2',
@@ -66,7 +66,7 @@ my @supportedVersions = (
             'i586 x86_64',
         packageKeysLocation => 
             'http://download.opensuse.org/distribution/11.2/repo/oss/'
-    }
+    },
     {
         ver => 
             '11.3',
@@ -76,7 +76,18 @@ my @supportedVersions = (
             'i586 x86_64',
         packageKeysLocation => 
             'http://download.opensuse.org/distribution/11.3/repo/oss/'
+    },
+    {
+        ver =>
+            '11.4',
+        source =>
+            'http://mirrors.opensuse.org/list/11.4.html',
+        supporedArch =>
+            'i586 x86_64',
+        packageKeysLocation =>
+            'http://download.opensuse.org/distribution/11.4/repo/oss/'
     }
+
 );
 
 my %sourceLists = (
@@ -273,13 +284,13 @@ while (my $version = shift(@supportedVersions)) {
 
     $running = cleanupThreads();
     printf ("\n-- waiting for %i unfinished check(s) ..\n", $running);
-    my $counter = 120;
+    my $counter = 30;
     my $exit = 0;
     while( $exit == 0 ) { 
         sleep 0.5; 
         $running = cleanupThreads();
         $counter--;
-        if ( $counter < 1 && $running > 0 ) {
+        if ( $counter < 1 ) {
             printf ("\n-- %i check(s) still running.. \n", $running);
             print ("\n-- cleanup remaining check(s)..");
             my @runningthreads = threads->list();
-- 
cgit v1.2.3-55-g7522