fix unexpected prefix/image distinction
authorMoritz Warning <moritzwarning@web.de>
Sun, 2 Feb 2020 04:14:25 +0000 (05:14 +0100)
committerMoritz Warning <moritzwarning@web.de>
Sun, 2 Feb 2020 04:14:25 +0000 (05:14 +0100)
this happens when only one image file is available, factory/sysupgrade might be part of the prefix

www/index.js

index 99acb6474d396448581c736f2bab5fe5f3eb68ac..080e3aad56d5148d35140c7db7d8b99938cc5b05 100644 (file)
@@ -220,15 +220,16 @@ function updateImages(dllink, model, target, release, commit, prefix, images) {
 
     for (var i in images) {
       var image = images[i];
-      if (image.includes('factory')) {
+      var file = prefix + image;
+      if (file.includes('-factory')) {
         entries['FACTORY'].push(image);
-      } else if (image.includes('sysupgrade')) {
+      } else if (file.includes('-sysupgrade')) {
         entries['SYSUPGRADE'].push(image);
-      } else if (image.includes('kernel') || image.includes('zImage') || image.includes('uImage')) {
+      } else if (file.includes('-kernel') || file.includes('-zImage') || file.includes('-uImage')) {
         entries['KERNEL'].push(image);
-      } else if (image.includes('rootfs')) {
+      } else if (file.includes('-rootfs')) {
         entries['ROOTFS'].push(image);
-      } else if (image.includes('sdcard')) {
+      } else if (file.includes('-sdcard')) {
         entries['SDCARD'].push(image);
       } else {
         entries['OTHER'].push(image);