From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 3 Apr 2025 09:51:41 +0000 (+0200)
Subject: cli: extend remove call to allow passing values directly
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37c80e61ee6f8fb513639a89b42dcdaaadb3d156;p=thirdparty%2Fopenwrt.git

cli: extend remove call to allow passing values directly

This simplifies script or API usage of this command to remove values directly
without having to calculate the index

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/utils/cli/files/usr/share/ucode/cli/object-editor.uc b/package/utils/cli/files/usr/share/ucode/cli/object-editor.uc
index 0a447540644..1f36ee9d074 100644
--- a/package/utils/cli/files/usr/share/ucode/cli/object-editor.uc
+++ b/package/utils/cli/files/usr/share/ucode/cli/object-editor.uc
@@ -135,8 +135,14 @@ export function remove_call(ctx, argv, named)
 		if (!data)
 			continue;
 
-		for (let idx in val)
+		for (let idx in val) {
+			if (idx != "" + +idx) {
+				let cur_idx = index(data, idx);
+				if (cur_idx >= 0)
+					idx = cur_idx + 1;
+			}
 			data[+idx - 1] = null;
+		}
 
 		cur_obj[name] = filter(data, (v) => v != null);
 		if (cur.attribute_allow_empty && !length(cur_obj[name]))