diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-18 16:34:28 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-18 16:34:28 -0400 |
| commit | 3493653759246ad0faea6370bb94290636973fba (patch) | |
| tree | 12bda8da27bad7552dc80e4a7e623628bf6fdadd /Build/DistributionUpdate.hs | |
| parent | 8dcefe87895ad392196736a1624d4433445c6996 (diff) | |
fix generation of infor files
Now have files relative to the top of the repo.
Diffstat (limited to 'Build/DistributionUpdate.hs')
| -rw-r--r-- | Build/DistributionUpdate.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Build/DistributionUpdate.hs b/Build/DistributionUpdate.hs index 98a2417c9..ea8796969 100644 --- a/Build/DistributionUpdate.hs +++ b/Build/DistributionUpdate.hs @@ -103,14 +103,14 @@ makeinfos updated = do now <- liftIO getCurrentTime liftIO $ putStrLn $ "building info files in " ++ basedir forM_ updated $ \(f, bv) -> do - v <- lookupFile f + v <- lookupFile (basedir </> f) case v of Nothing -> noop Just k -> whenM (inAnnex k) $ do liftIO $ putStrLn f - let infofile = f ++ ".info" + let infofile = basedir </> f ++ ".info" liftIO $ writeFile infofile $ show $ GitAnnexDistribution - { distributionUrl = mkUrl basedir f + { distributionUrl = mkUrl f , distributionKey = k , distributionVersion = bv , distributionReleasedate = now @@ -118,7 +118,7 @@ makeinfos updated = do } void $ inRepo $ runBool [Param "add", File infofile] signFile infofile - signFile f + signFile (basedir </> f) void $ inRepo $ runBool [ Param "commit" , Param "-m" @@ -151,8 +151,8 @@ getRepoDir = do home <- liftIO myHomeDir return $ home </> "lib" </> "downloads" -mkUrl :: FilePath -> FilePath -> String -mkUrl basedir f = "https://downloads.kitenet.net/" ++ relPathDirToFile basedir f +mkUrl :: FilePath -> String +mkUrl f = "https://downloads.kitenet.net/" ++ f signFile :: FilePath -> Annex () signFile f = do |