From 7fcff0b6a287b4e048623d943e2c832cac857563 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 6 Jun 2023 08:12:42 +0000 Subject: [PATCH] sane-scripts: lift `sane-ip-check` out of resholve --- pkgs/additional/sane-scripts/default.nix | 7 ++++++- pkgs/additional/sane-scripts/src/sane-ip-check | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/additional/sane-scripts/default.nix b/pkgs/additional/sane-scripts/default.nix index 38b81501..371ec038 100644 --- a/pkgs/additional/sane-scripts/default.nix +++ b/pkgs/additional/sane-scripts/default.nix @@ -26,7 +26,6 @@ let # see: "bin" coreutils-full - curl file findutils gnugrep @@ -39,6 +38,7 @@ let oath-toolkit openssh openssl + py-scripts.ip-check rmlint rsync ssh-to-age @@ -157,6 +157,11 @@ let src = ./src; pkgs = [ "git" ]; }; + ip-check = static-nix-shell.mkBash { + pname = "sane-ip-check"; + src = ./src; + pkgs = [ "curl" "gnugrep" ]; + }; ip-check-upnp = static-nix-shell.mkPython3Bin { pname = "sane-ip-check-upnp"; src = ./src; diff --git a/pkgs/additional/sane-scripts/src/sane-ip-check b/pkgs/additional/sane-scripts/src/sane-ip-check index 708a69dd..15c454ef 100755 --- a/pkgs/additional/sane-scripts/src/sane-ip-check +++ b/pkgs/additional/sane-scripts/src/sane-ip-check @@ -1,4 +1,5 @@ -#!/usr/bin/env bash +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl -p gnugrep ip=$(curl --silent https://ipinfo.io/ip) echo "$ip" | grep -P " *^\d+\.\d+\.\d+\.\d+ *$" exit $?