Refine regexp

snabbco · Oct 16, 2015 · 59249e7 · 59249e7
1 parent cbfd314
commit 59249e7
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/core/main.lua b/src/core/main.lua
@@ -73,9 +73,9 @@ function usage (status)
 end
 
 function programname (program)
-   return program:gsub("^.*/", ""):
-                  gsub("-[0-9.]+$", ""):
-                  gsub("-", "_")
+   return program:gsub("^.*/", "")
+                 :gsub("-[0-9.]+[-%w]+$", "")
+                 :gsub("-", "_")
 end
 
 function modulename (program)
@@ -117,6 +117,8 @@ end
 function selftest ()
    assert(programname("/bin/snabb-1.0") == "snabb",
       "Incorrect program name parsing")
+   assert(programname("/bin/snabb-1.0-alpha2") == "snabb",
+      "Incorrect program name parsing")
    assert(programname("/bin/snabb-nfv") == "snabb_nfv",
       "Incorrect program name parsing")
    assert(programname("/bin/snabb-nfv-1.0") == "snabb_nfv",