diff options
| author | Inari Listenmaa <inari.listenmaa@gmail.com> | 2021-07-06 09:37:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 09:37:22 +0200 |
| commit | d2fb755fab8b9ba2dcde20d2854b1f90fb8c2f76 (patch) | |
| tree | 106d4ff2a5b4548f3bea6a83ffcc9b8664b2f179 /src/compiler/GF/Command | |
| parent | 5d7c687cb77ba10fd8a0ae70a605bb02f1ba59cf (diff) | |
| parent | 1b66bf2773b0feda528d3b22fbaf06227a51b864 (diff) | |
Merge branch 'master' into concrete-new
Diffstat (limited to 'src/compiler/GF/Command')
| -rw-r--r-- | src/compiler/GF/Command/CommonCommands.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/GF/Command/CommonCommands.hs b/src/compiler/GF/Command/CommonCommands.hs index 0b698e79c..c685fc525 100644 --- a/src/compiler/GF/Command/CommonCommands.hs +++ b/src/compiler/GF/Command/CommonCommands.hs @@ -15,6 +15,7 @@ import GF.Command.Abstract --(isOpt,valStrOpts,prOpt) import GF.Text.Pretty import GF.Text.Transliterations import GF.Text.Lexing(stringOp,opInEnv) +import Data.Char (isSpace) import qualified PGF as H(showCId,showExpr,toATree,toTrie,Trie(..)) @@ -170,7 +171,8 @@ commonCommands = fmap (mapCommandExec liftSIO) $ Map.fromList [ restrictedSystem $ syst ++ " <" ++ tmpi ++ " >" ++ tmpo fmap fromString $ restricted $ readFile tmpo, -} - fmap fromString . restricted . readShellProcess syst $ toString arg, + fmap (fromStrings . lines) . restricted . readShellProcess syst . unlines . map (dropWhile (=='\n')) $ toStrings $ arg, + flags = [ ("command","the system command applied to the argument") ], |
