(aura) Pull package sources via git

fosskers · Jul 7, 2018 · ca9c38d · ca9c38d
1 parent 19ccb24
commit ca9c38d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/aura/lib/Aura/Build.hs b/aura/lib/Aura/Build.hs
@@ -32,6 +32,7 @@ module Aura.Build
 import           Aura.Core
 import           Aura.Languages
 import           Aura.MakePkg
+import           Aura.Packages.AUR (clone)
 import           Aura.Pacman (pacman)
 import           Aura.Settings
 import           Aura.Types
@@ -100,7 +101,7 @@ build' ss p = do
 getBuildScripts :: Buildable -> User -> Sh (Either Failure FilePath)
 getBuildScripts pkg user = do
   currDir <- toTextIgnore <$> pwd
-  scriptsDir <- chown user currDir [] *> liftIO (buildScripts pkg (T.unpack currDir))
+  scriptsDir <- chown user currDir [] *> clone pkg
   case scriptsDir of
     Nothing -> pure . Left . Failure . buildFail_7 $ bldNameOf pkg
     Just sd -> do

diff --git a/aura/lib/Aura/Packages/AUR.hs b/aura/lib/Aura/Packages/AUR.hs
@@ -29,6 +29,7 @@ module Aura.Packages.AUR
   ( aurLookup
   , aurRepo
   , isAurPackage
+  , clone
   , sourceTarball
   , aurInfo
   , aurSearch
@@ -49,8 +50,9 @@ import           Data.Versions (versioning)
 import           Internet
 import           Linux.Arch.Aur
 import           Network.HTTP.Client (Manager)
+import           Shelly (Sh, run_)
 import           System.FilePath ((</>))
-import           Utilities (decompress, list)
+import           Utilities (list, quietSh)
 
 ---
 
@@ -81,9 +83,7 @@ buildable m ai = do
       , bldProvidesOf = list (Provides $ aurNameOf ai) (Provides . head) $ providesOf ai
       , bldDepsOf     = mapMaybe parseDep $ dependsOf ai ++ makeDepsOf ai  -- TODO bad mapMaybe?
       , bldVersionOf  = either (const Nothing) Just . versioning $ aurVersionOf ai
-      , isExplicit    = False
-      , buildScripts  = f }
-    where f fp = sourceTarball m fp (pkgBaseOf ai) >>= traverse (fmap T.unpack . decompress (T.pack fp) . T.pack)
+      , isExplicit    = False }
 
 isAurPackage :: (Member (Reader Settings) r, Member IO r) => T.Text -> Eff r Bool
 isAurPackage name = asks managerOf >>= \m -> isJust <$> send (pkgbuild' @IO m name)
@@ -97,6 +97,16 @@ aurLink = "https://aur.archlinux.org"
 pkgUrl :: T.Text -> T.Text
 pkgUrl pkg = T.pack $ T.unpack aurLink </> "packages" </> T.unpack pkg
 
+-------------------
+-- SOURCES FROM GIT
+-------------------
+clone :: Buildable -> Sh (Maybe FilePath)
+clone b = do
+  (ec, _) <- quietSh $ run_ "git" ["clone", "--depth", "1", aurLink <> "/" <> bldBaseNameOf b <> ".git"]
+  case ec of
+    (ExitFailure _) -> pure Nothing
+    ExitSuccess     -> pure . Just . T.unpack $ bldBaseNameOf b
+
 ------------------
 -- SOURCE TARBALLS
 ------------------

diff --git a/aura/lib/Aura/Types.hs b/aura/lib/Aura/Types.hs
@@ -173,11 +173,7 @@ data Buildable = Buildable
     , bldDepsOf     :: [Dep]
     , bldVersionOf  :: Maybe Versioning
     -- | Did the user select this package, or is it being built as a dep?
-    , isExplicit    :: Bool
-    -- | Fetch and extract the source code corresponding to the given package.
-    -- Expects a directory in which to place the scripts, and yields the path
-    -- they were successfully extracted to.
-    , buildScripts  :: FilePath -> IO (Maybe FilePath) }
+    , isExplicit    :: Bool }
 
 data Language = English
               | Japanese