argotk.hs completion fix

completion/argotk.sh

@@ -8,7 +8,7 @@ _argotk.hs()
         CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg)
     done
 
-    COMPREPLY=( $(./argotk/argotk.hs "${CMDLINE[@]}") )
+    COMPREPLY=( $(./argotk.hs "${CMDLINE[@]}") )
 }
 
 complete -o filenames -F _argotk.hs argotk.hs

default.nix

@@ -39,7 +39,7 @@ let
   ];
 
   shellHook = ''
-    source completion/argotk.sh
+    source ${./completion/argotk.sh}
     echo "Installed bash completion."
   '';
 

shake.hs

@@ -12,7 +12,7 @@ main = shakeArgs shakeOptions $ do
   want ["README.md", "completion/argotk.sh"]
 
   "completion/*.sh"
-    %> \out -> mkCompletionRule out "bash" $ "argotk" </> takeFileName out -<.> "hs"
+    %> \out -> mkCompletionRule out "bash" $ takeFileName out -<.> "hs"
 
   "README.md" %> \out -> do
     let template = ".README.md"
@@ -22,9 +22,8 @@ main = shakeArgs shakeOptions $ do
          [take (length panpipe - 1) panpipe, template, "-o", out]
  where
   mkCompletionAction str sn =
-    (sn, cmd ("./" ++ sn) ["--" ++ str ++ "-completion-script", "." </> sn])
+    (sn, cmd ("./argotk/" ++ sn) ["--" ++ str ++ "-completion-script", "." </> sn])
   mkCompletionRule out str fn = do
     let (needed, cplA) = mkCompletionAction str fn
-    need [needed]
     (Stdout cplScript) <- cplA
     liftIO $ writeFile out cplScript