Release 1.0.6: синхронизировать изменения из upstream и исправить баг фильтра URLTest/Priority

2026-07-14 08:56:31 +03:00
parent bb1de1fd83
commit 46ef97fe89
130 changed files with 4146 additions and 4445 deletions
@@ -1,4 +1,4 @@
-#!/usr/bin/env ucode
+#!/usr/bin/env ucode

 let fs = require("fs");
 let uci = require("core.uci");
@@ -7,9 +7,13 @@ const CONFIG_NAME = getenv("TACHYON_CONFIG_NAME") || "tachyon";
 const SB_DNS_INBOUND_ADDRESS = getenv("SB_DNS_INBOUND_ADDRESS") || "127.0.0.42";
 const DNSMASQ_INIT = getenv("DNSMASQ_INIT") || "/etc/init.d/dnsmasq";

-let common = require("core.common");
-let as_string = common.as_string;
-let shell_quote = common.shell_quote;
+function as_string(value) {
+    return value == null ? "" : "" + value;
+}
+
+function shell_quote(value) {
+    return "'" + replace(as_string(value), /'/g, "'\\''") + "'";
+}

 function run(command) {
    return system(command) == 0;
@@ -299,4 +303,4 @@ else if (mode == "default-config-complete")
    exit(dnsmasq_default_config_is_complete() ? 0 : 1);

 warn("Usage: dns/apply.uc <configure|restore|failsafe-restore|has-tachyon-dns|has-managed-state|default-config-complete>\n");
-exit(1);
+exit(1);