summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--src/wrapper.hs11
2 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 5047c2f9..dec7f055 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,9 @@ install:
cat dist/propellor-*.tar.gz | (cd dist/gittmp && tar zx --strip-components=1)
cd dist/gittmp && git init && \
git add . \
- && git commit -m "distributed version of propellor" \
+ && git commit -q -m "distributed version of propellor" \
&& git bundle create $(DESTDIR)/usr/src/propellor/propellor.git master HEAD \
- && git show-ref HEAD --hash > $(DESTDIR)/usr/src/propellor/head
+ && git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head
rm -rf dist/gittmp
clean:
diff --git a/src/wrapper.hs b/src/wrapper.hs
index f323a541..31c2c437 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -29,8 +29,14 @@ import System.Exit
import System.Posix.Directory
import System.IO
+distdir :: FilePath
+distdir = "/usr/src/propellor"
+
distrepo :: FilePath
-distrepo = "/usr/src/propellor/propellor.git"
+distrepo = distdir </> "propellor.git"
+
+disthead :: FilePath
+disthead = distdir </> "head"
-- Using the github mirror of the main propellor repo because
-- it is accessible over https for better security.
@@ -60,8 +66,6 @@ wrapper args propellordir propellorbin = do
let repo = if distexists then distrepo else netrepo
void $ boolSystem "git" [Param "clone", File repo, File propellordir]
- disthead = propellordir </> "head"
-
checkRepo = whenM (doesFileExist disthead) $ do
headrev <- readFile disthead
changeWorkingDirectory propellordir
@@ -75,6 +79,7 @@ wrapper args propellordir propellorbin = do
n ("** Your " ++ propellordir ++ " is out of date..")
n (" A newer upstream version is available in " ++ distrepo)
n (" To merge it, run eg: git pull origin master")
+ n ""
buildruncfg = do
changeWorkingDirectory propellordir
ifM (boolSystem "make" [Param "build"])