diff options
2 files changed, 6 insertions, 17 deletions
diff --git a/doc/components.mdwn b/doc/components.mdwn
index 2c67d9db..93be79cb 100644
--- a/doc/components.mdwn
+++ b/doc/components.mdwn
@@ -24,20 +24,9 @@ then copy in `~/.propellor/src/Propellor/` and it will be used. See
[[contributing]] if you want to send your improvements back.
All that really needs to be in `~/.propellor/` though, is a `config.hs`
-file, and a cabal file. If you want to set up the repository manually,
-and don't want it to contain propellor's source code, here's a stub cabal
-file to get you started:
+file, and a cabal file. To use propellor this way, you can first
+install propellor, and then copy the two files from the
+[mininalconfig branch](;a=tree;h=refs/heads/minimalconfig;hb=refs/heads/minimalconfig),
+or clone it:
-Name: foo
-Cabal-Version: >= 1.6
-Build-Type: Simple
-Version: 0
-Executable propellor-config
- Main-Is: config.hs
- GHC-Options: -Wall -threaded -O0
- Build-Depends: propellor, base >= 3
-See [[haskell_newbie]] for an example config.hs file.
+ git clone ssh:// .propellor --branch minimalconfig --single-branch
diff --git a/src/wrapper.hs b/src/wrapper.hs
index 034eb2bf..a73ed969 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -77,7 +77,7 @@ wrapper args propellordir propellorbin = do
, void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir]
- checkRepo = whenM (doesFileExist disthead) $ do
+ checkRepo = whenM (doesFileExist disthead <&&> doesFileExist (propellordir </> "propellor.cabal")) $ do
headrev <- takeWhile (/= '\n') <$> readFile disthead
changeWorkingDirectory propellordir
headknown <- catchMaybeIO $