fix: apt

softvisio-node · Mar 28, 2024 · 8934ea0 · 8934ea0
1 parent cccbb88
commit 8934ea0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/lib/apt.js b/lib/apt.js
@@ -371,7 +371,7 @@ export default class {
         const packages = {};
 
         for ( const file of files ) {
-            const match = path.basename( file ).match( /^(.+)_([\d.]+)-(\d+)_(.+)\.deb$/ );
+            const match = path.basename( file ).match( /^(.+)_(?:(\d+):)?([\d.]+)(?:-(\d+))?_(.+)\.deb$/ );
 
             if ( !match ) continue;
 
@@ -384,9 +384,10 @@ export default class {
                 file,
                 id,
                 name,
-                "version": match[ 2 ],
-                "revision": +match[ 3 ],
-                "arch": match[ 4 ],
+                "epoch": match[ 2 ] ? +match[ 2 ] : 0,
+                "version": match[ 3 ],
+                "revision": match[ 4 ] ? +match[ 4 ] : 0,
+                "arch": match[ 5 ],
             } );
         }
 
@@ -395,7 +396,7 @@ export default class {
 
             // sort dists
             dists = dists.sort( ( a, b ) => {
-                return a.revision - b.revision || new Semver( a.version ).compare( b.version );
+                return a.epoch - b.epoch || new Semver( a.version ).compare( b.version ) || a.revision - b.revision;
             } );
 
             // keep latest dist