input-output-hk/foliage
1
1
Fork 0
mirror of https://github.com/input-output-hk/foliage.git synced 2024-12-01 21:02:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with outputdir

Browse Source
This commit is contained in:
Andrea Bedini 2022-09-19 16:28:14 +02:00
parent 03a8fe471d
commit c166412ff9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Foliage/CmdBuild.hs
View File

@ -378,7 +378,7 @@ cmdBuild
--
outputDir </> "index/*/*/*.cabal" %> \path -> do
let [_, _, pkgName, pkgVersion, _] = splitDirectories path
let [_, _, pkgName, pkgVersion, _] = splitDirectories (drop (length outputDir) path)
let Just name = simpleParsec pkgName
let Just version = simpleParsec pkgVersion
let pkgId = PackageIdentifier name version
@ -398,11 +398,11 @@ cmdBuild
--
outputDir </> "index/*/*/package.json" %> \path -> do
let [_, _, pkgName, pkgVersion, _] = splitDirectories path
let [_, _, pkgName, pkgVersion, _] = splitDirectories (drop (length outputDir) path)
let packagePath = "package" </> pkgName <> "-" <> pkgVersion <.> "tar.gz"
let targetPath = rootPath $ fromUnrootedFilePath packagePath
targetFileInfo <- computeFileInfoSimple' ("_repo" </> packagePath)
targetFileInfo <- computeFileInfoSimple' (outputDir </> packagePath)
expires <- getExpiryTime GetExpiryTime
@ -425,7 +425,7 @@ cmdBuild
--
outputDir </> "package/*.tar.gz" %> \path -> do
let [_, _, filename] = splitDirectories path
let [_, _, filename] = splitDirectories (drop (length outputDir) path)
let Just pkgId = stripExtension "tar.gz" filename >>= simpleParsec
srcDir <- preparePackageSource $ PreparePackageSource pkgId