From 88a6bea6e802ce0d8190418b7b076ee12fdf1f47 Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Tue, 4 Aug 2020 17:57:01 -0700
Subject: fix(users/edef/depot-scan): properly depend on pl script

Change-Id: I83c75ab75dae9c904e127ad6160c7641d4523e40
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1647
Reviewed-by: edef <edef@edef.eu>
Tested-by: BuildkiteCI
---
 users/edef/depot-scan.nix |  4 ++--
 users/edef/depot-scan.pl  | 11 +++++++++++
 users/edef/sources.pl     | 11 -----------
 3 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100755 users/edef/depot-scan.pl
 delete mode 100755 users/edef/sources.pl

(limited to 'users')

diff --git a/users/edef/depot-scan.nix b/users/edef/depot-scan.nix
index faa91855e8f9..ce0f8d97990b 100644
--- a/users/edef/depot-scan.nix
+++ b/users/edef/depot-scan.nix
@@ -3,10 +3,10 @@
 pkgs.writeShellScriptBin "depot-scan" ''
   set -euo pipefail
 
-  path=$(git rev-parse --show-prefix)
+  path="''${1:-$(git rev-parse --show-prefix)}"
   path="''${path%%/}"
   attr="''${path//\//.}"
   root="$(git rev-parse --show-toplevel)"
   echo "scanning //$path" >&2
-  nix-instantiate "$root" -A "$attr" -vv 2> >(${pkgs.perl}/bin/perl sources.pl) >&2
+  nix-instantiate "$root" -A "$attr" -vv 2> >(${pkgs.perl}/bin/perl ${./depot-scan.pl}) >&2
 ''
diff --git a/users/edef/depot-scan.pl b/users/edef/depot-scan.pl
new file mode 100755
index 000000000000..39550d83c1a5
--- /dev/null
+++ b/users/edef/depot-scan.pl
@@ -0,0 +1,11 @@
+#! /usr/bin/env -S perl -ln
+use strict;
+
+if (/^evaluating file '(.*)'$/ or
+    /^copied source '(.*)' -> '.*'$/ or
+    /^trace: lorri read: '(.*)'$/) {
+    print $1;
+    next;
+}
+
+print STDERR unless /^instantiated '.*' -> '.*'$/;
diff --git a/users/edef/sources.pl b/users/edef/sources.pl
deleted file mode 100755
index 39550d83c1a5..000000000000
--- a/users/edef/sources.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /usr/bin/env -S perl -ln
-use strict;
-
-if (/^evaluating file '(.*)'$/ or
-    /^copied source '(.*)' -> '.*'$/ or
-    /^trace: lorri read: '(.*)'$/) {
-    print $1;
-    next;
-}
-
-print STDERR unless /^instantiated '.*' -> '.*'$/;
-- 
cgit 1.4.1