Allow both quotation style in nix derivations

.gitignore

@@ -5,5 +5,5 @@ test_script*
 docs_test/*
 test/*-temp
 result/*
-result/
+**/result/
 notes/*

nix/makePrunedSrc.nix

@@ -3,6 +3,7 @@
   , source
   , filter
   , glibcLocales
+  , lib
 }:
 stdenv.mkDerivation {
   name = "pruned_src";
@@ -12,18 +13,16 @@ stdenv.mkDerivation {
   buildPhase = ''
     export LANG="en_US.UTF-8"
     mkdir $out
-    echo $(locale)
-    echo "treeSurgeon is located: ${treeSurgeon}"
-    if $(${treeSurgeon}/bin/tree-surgeon to-bash -f '${filter}' -s ${source} > call_out 2> call_err); then
+    if $(${treeSurgeon}/bin/tree-surgeon to-bash \
+        -f ${lib.strings.escapeNixString filter} \
+        -s ${source} > call_out 2> call_err);
+    then
         BASHARR="$(cat call_out)"
         cd ${source}
         cp --parents $BASHARR $out/
     else
-        echo "is not working; test char is: │"
         ERRMSG=$(cat call_err)
-        echo "Echoing error"
         echo "$ERRMSG"
-        echo "Exiting"
         exit 1
     fi
   '';

notes/notes.md

@@ -2,8 +2,6 @@
 ----------
 
 We have three current issues:
-- If you screw up your ts expression in prune, you get crazy error output
-  - An incorrect filter expression doesn't return a non-zero error code
 - Error messages probably still not great
 - It does not seem to work with "endsWith '.cpp' (basename file)", does using '' " " '' though
 - README is incomplete and the documentation doesn't really describe the command-line options.

result

@@ -1 +1 @@
-/nix/store/pp79zhm1dcgdsd1vdxrgwcrkq87walks-tstest
+/nix/store/9h2mqw0srb8gq8rfs5viakqjcj33hg0i-tstest

src/app/TreeFilter.hs

@@ -20,7 +20,6 @@ import Debug.Trace (trace)
 import qualified Data.Text as T
 import System.Directory.Tree
 import System.Exit
-import System.IO (hPutStrLn, stderr)
 import TextShow
 import qualified Lexer as X
 
@@ -65,19 +64,15 @@ applyFilterWith :: FileName -> (DirTree FData -> IO()) -> BS.ByteString -> IO ()
 applyFilterWith dirname ioF filterStr = do
     filteredTreeE <- applyFilter dirname filterStr
     case filteredTreeE of
-        Left (e:_) -> do
-            hPutStrLn stderr $ trace ("to error message: " <> toErrorMessage filterStr e) (toErrorMessage filterStr e)
-            exitWith (ExitFailure 1)
+        Left (e:_) -> die $ toErrorMessage filterStr e
         Left [] -> error "Wie ist es moglich"
         Right filtered -> ioF filtered
 
 applyFilterWithReproduce :: FileName -> (DirTree FData -> IO()) -> BS.ByteString -> IO ()
 applyFilterWithReproduce dirname ioF filterStr = do
     filteredTreeE <- applyFilter dirname filterStr
     case filteredTreeE of
-        Left (e:_) -> do
-            hPutStrLn stderr $ trace ("to error message: " <> toErrorMessage filterStr e) (toErrorMessage filterStr e)
-            exitWith (ExitFailure 1)
+        Left (e:_) -> die $ toErrorMessage filterStr e
         Left [] -> error "Wie ist es moglich"
         Right filtered -> ioF filtered
 
@@ -86,9 +81,7 @@ applyFilterWithComparative dirname ioF filterStr = do
     anchoredTree <- readDirectoryWith return dirname
     filteredTreeE <- applyFilter dirname filterStr
     case filteredTreeE of
-        Left (e:_) -> do
-            hPutStrLn stderr $ trace ("to error message: " <> toErrorMessage filterStr e) (toErrorMessage filterStr e)
-            exitWith (ExitFailure 1)
+        Left (e:_) -> die $ toErrorMessage filterStr e
         Left [] -> error "Wie ist es moglich"
         Right filtered -> ioF (toElements $ dirTree anchoredTree) filtered
 
@@ -97,9 +90,7 @@ applyFilterWithComparativeReproduce dirname ioF filterStr = do
     anchoredTree <- readDirectoryWith return dirname
     filteredTreeE <- applyFilter dirname filterStr
     case filteredTreeE of
-        Left (e:_) -> do
-            hPutStrLn stderr $ trace ("to error message:\n" <> toErrorMessage filterStr e) (toErrorMessage filterStr e)
-            exitWith (ExitFailure 1)
+        Left (e:_) -> die $ toErrorMessage filterStr e
         Left [] -> error "Wie ist es moglich"
         Right filtered -> ioF (toElements $ dirTree anchoredTree) filtered
 

tree-surgeon-test.nix

@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation {
   name = "tstest";
-  src = tsLib.prune ./src/test/test-data ''endsWit ".cpp" (basename file)'';
+  src = tsLib.prune ./src/test/test-data "endsWith '.cpp' (basename file)";
   dontUnpack = true;
   buildPhase = ''
     mkdir $out