ghoscht/arion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement uid parameter

Browse source
This commit is contained in:
Robert Hensing 2019-09-28 00:51:16 +02:00
parent 77c492fa86
commit 02c0f80b02
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arion-compose.cabal
View file

@ -38,6 +38,7 @@ common deps
, temporary , temporary
, text , text
, protolude , protolude
, unix
flag ghci flag ghci
default: False default: False

21
src/haskell/exe/Main.hs
View file

@ -22,9 +22,10 @@ import qualified Data.Text.Lazy.Builder as TB
import qualified Data.List.NonEmpty as NE import qualified Data.List.NonEmpty as NE
import Data.List.NonEmpty (NonEmpty(..)) import Data.List.NonEmpty (NonEmpty(..))
import Control.Arrow ((>>>)) import Control.Arrow ((>>>))
import System.Posix.User (getRealUserID)
data CommonOptions = data CommonOptions =
CommonOptions CommonOptions
{ files :: NonEmpty FilePath { files :: NonEmpty FilePath
@ -159,14 +160,16 @@ runEvalAndDC cmd dopts opts = do
} }
defaultEvaluationArgs :: CommonOptions -> IO EvaluationArgs defaultEvaluationArgs :: CommonOptions -> IO EvaluationArgs
defaultEvaluationArgs co = pure EvaluationArgs defaultEvaluationArgs co = do
{ evalUid = 0 -- TODO uid <- getRealUserID
, evalModules = files co pure EvaluationArgs
, evalPkgs = pkgs co { evalUid = fromIntegral uid
, evalWorkDir = Nothing , evalModules = files co
, evalMode = ReadWrite , evalPkgs = pkgs co
, evalUserArgs = nixArgs co , evalWorkDir = Nothing
} , evalMode = ReadWrite
, evalUserArgs = nixArgs co
}
runCat :: CommonOptions -> IO () runCat :: CommonOptions -> IO ()
runCat co = do runCat co = do