From 81fdf4eff644286c245f4f76cc1107afa6bd77f8 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 23 May 2026 15:47:01 -0400 Subject: [PATCH] openwrt skyg command --- modules/openwrt/default.nix | 10 ++++++---- secrets/glmain.json.age | Bin 5935 -> 4950 bytes 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/openwrt/default.nix b/modules/openwrt/default.nix index 91175d5..e6e6029 100644 --- a/modules/openwrt/default.nix +++ b/modules/openwrt/default.nix @@ -30,15 +30,17 @@ let echo "" echo "$DNSMASQ" - echo "=== dnsmasq.conf diff ===" - ${pkgs.diffutils}/bin/diff --color=always <(echo "$CURRENT_DNSMASQ") <(echo "$DNSMASQ") || true + echo "=== dnsmasq.conf diff [START] ===" + comm -3 <(echo "$CURRENT_DNSMASQ" | sort) <(echo "$DNSMASQ" | sort) + echo "=== dnsmasq.conf diff [END] ===" echo "" read -p "Looks good? [y/N] " -n 1 -r < /dev/tty; echo [[ $REPLY =~ ^[Yy]$ ]] || exit 1 echo "$ETHERS" - echo "=== ethers diff ===" - ${pkgs.diffutils}/bin/diff --color=always <(echo "$CURRENT_ETHERS") <(echo "$ETHERS") || true + echo "=== ethers diff [START] ===" + comm -3 <(echo "$CURRENT_ETHERS" | sort) <(echo "$ETHERS" | sort) + echo "=== ethers diff [END] ===" echo "" read -p "Deploy to $SERVER? [y/N] " -n 1 -r < /dev/tty; echo diff --git a/secrets/glmain.json.age b/secrets/glmain.json.age index 7bed1a62f0471f20983f28c5b9974dba26a9e63f..d880458e4277cb75a0c18ab673a9f2485571df1a 100644 GIT binary patch literal 4950 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