Merge pull request #525 from draios/probe-refactor

Probe refactor

Author: gianlucaborello

scripts/build-probe-binaries

@@ -118,7 +118,7 @@ function build_sysdigcloud {
 
 function coreos_build_old {
 	VERSION_URL=$1
-	VERSION_NUMBER=$(echo $VERSION_URL | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+	VERSION_NUMBER=$2
 	COREOS_DIR="coreos-"$VERSION_NUMBER
 
 	if [ ! -d $COREOS_DIR ]; then
@@ -175,7 +175,7 @@ function coreos_build_old {
 
 function coreos_build_new {
 	VERSION_URL=$1
-	VERSION_NUMBER=$(echo $VERSION_URL | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+')
+	VERSION_NUMBER=$2
 	COREOS_DIR="coreos-"$VERSION_NUMBER
 
 	if [ ! -d $COREOS_DIR ]; then
@@ -409,12 +409,11 @@ URLS="$($DIR/kernel-crawler.py CoreOS)"
 
 for URL in $URLS
 do
-	FULL_VERSION=$(echo $URL|cut -d/ -f5)
-	MAJOR_VERSION=$(echo $FULL_VERSION|cut -d. -f1)
-	if [ $MAJOR_VERSION -gt 890 ]; then
-		coreos_build_new $URL
+	eval $(curl -s ${URL}version.txt)
+	if [ $COREOS_BUILD -gt 890 ]; then
+		coreos_build_new $URL $COREOS_VERSION
 	else
-		coreos_build_old $URL
+		coreos_build_old $URL $COREOS_VERSION
 	fi
 done
 

scripts/kernel-crawler.py

@@ -128,7 +128,7 @@
 			"subdirs" : [
 				""
 			],
-			"page_pattern" : "/html/body//a[regex:test(@href, '^[5-9][0-9][0-9]')]/@href"
+			"page_pattern" : "/html/body//a[regex:test(@href, '^[5-9][0-9][0-9]|current')]/@href"
 		},
 
 		{
@@ -137,7 +137,7 @@
 			"subdirs" : [
 				""
 			],
-			"page_pattern" : "/html/body//a[regex:test(@href, '^[5-9][0-9][0-9]')]/@href"
+			"page_pattern" : "/html/body//a[regex:test(@href, '^[5-9][0-9][0-9]|current')]/@href"
 		},
 
 		{
@@ -146,7 +146,7 @@
 			"subdirs" : [
 				""
 			],
-			"page_pattern" : "/html/body//a[regex:test(@href, '^[4-9][0-9][0-9]')]/@href"
+			"page_pattern" : "/html/body//a[regex:test(@href, '^[4-9][0-9][0-9]|current')]/@href"
 		}
 	]
 }
@@ -157,7 +157,7 @@
 # links will be found automagically without needing to write any single line of
 # code.
 #
-packages = {}
+urls = set()
 
 if len(sys.argv) < 2 or not sys.argv[1] in repos:
 	sys.stderr.write("Usage: " + sys.argv[0] + " <distro>\n")
@@ -184,13 +184,12 @@
 				rpms = html.fromstring(page).xpath(repo["page_pattern"], namespaces = {"regex": "http://exslt.org/regular-expressions"})
 
 				for rpm in rpms:
-					if not rpm in packages:
-						packages[rpm] = source + rpm
+					urls.add(source + rpm)
 			except:
 				continue
 
 #
 # Print URLs to stdout
 #
-for rpm, url in packages.iteritems():
+for url in urls:
 	print(url)