From 32de4cbd934894e7be3dcb2c695229f8056f28cf Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 18 Aug 2021 11:38:59 +0200 Subject: refactor(users/grfn/gws.fyi): implement isDirectory in pure nix Another day, another import from derivation avoided by builtins.unsafeDiscardStringContext! Change-Id: I67274b1ba13ba980bb3346b22f2955c702aa3151 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3372 Tested-by: BuildkiteCI Reviewed-by: grfn Reviewed-by: tazjin --- users/grfn/gws.fyi/orgExportHTML.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'users') diff --git a/users/grfn/gws.fyi/orgExportHTML.nix b/users/grfn/gws.fyi/orgExportHTML.nix index e918e697d973..ac28580a5926 100644 --- a/users/grfn/gws.fyi/orgExportHTML.nix +++ b/users/grfn/gws.fyi/orgExportHTML.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, depot, ... }: with pkgs; with lib; @@ -22,21 +22,13 @@ let bn = builtins.baseNameOf src; filename = elemAt (splitString "." bn) 0; - isDirectory = import (runCommand "isDirectory" {} '' - if [ -d ${src} ]; then - echo "true" > $out - else - echo "false" > $out - fi - ''); - outName = if isNull headline then let bn = builtins.baseNameOf src; filename = elemAt (splitString "." bn) 0; in - if isDirectory + if depot.nix.utils.isDirectory src then filename else filename + ".html" else "${filename}-${replaceStrings [" "] ["-"] filename}.html"; -- cgit 1.4.1