refactor

1 files changed, 14 insertions, 13 deletions

diff --git a/slice.raku b/slice.raku
index ec7fa4f..17c8aec 100755
--- a/slice.raku
+++ b/slice.raku
@@ -14,28 +14,29 @@ class Image {
   }
 
   method generate(Int :$thumb-geometry, Str :$bg-blur) {
-    self.convert: ['-auto-orient', '-geometry', $thumb-geometry,
-                   $!source, $!thumb];
-    self.convert: ['-flip', '-geometry', $thumb-geometry/2,
-                   '-blur', $bg-blur,
-                   $!source, $!blur];
-    doit 'cp', [$!source, $!large] unless $!large.IO.f;
-  }
+    cmd 'convert', ['-auto-orient', '-geometry', $thumb-geometry,
+                    $!source, $!thumb]
+        unless $!thumb.IO.f;
+
+    cmd 'convert', ['-flip', '-geometry', $thumb-geometry/2,
+                    '-blur', $bg-blur,
+                    $!source, $!blur]
+        unless $!blur.IO.f;
 
-  method convert(@args) {
-    doit 'convert', @args unless @args[@args.end].IO.e;
+    cmd 'cp', [$!source, $!large] unless $!large.IO.f;
   }
 }
 
-sub doit(Str $command, @args) {
+sub cmd(Str $command, @args) {
   say "=> {$command} {@args}";
   my $proc = run $command, @args, :out, :err;
-  #say $proc.out.slurp(:close);
-  #say $proc.err.slurp(:close);
+  for $proc.out.slurp(:close), $proc.err.slurp(:close) {
+    .say if .chars > 0;
+  }
 }
 
 sub make-mr-proper(:$dist-dir) {
-  run 'rm', '-rf', $dist-dir if $dist-dir.IO.d;
+  cmd 'rm', <-r -f>, $dist-dir if $dist-dir.IO.d;
 }
 
 sub ensure-directories(:$dist-dir) {