cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-08-19 15:29:43 -04:00
parent c157fd4026 e0bbb776bf
commit c57ff0cb46
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -27,9 +27,9 @@ install:
cat dist/propellor-*.tar.gz | (cd dist/gittmp && tar zx --strip-components=1) cat dist/propellor-*.tar.gz | (cd dist/gittmp && tar zx --strip-components=1)
cd dist/gittmp && git init && \ cd dist/gittmp && git init && \
git add . \ 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 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 rm -rf dist/gittmp
clean: clean:

11
src/wrapper.hs
View File

@ -29,8 +29,14 @@ import System.Exit
import System.Posix.Directory import System.Posix.Directory
import System.IO import System.IO
distdir :: FilePath
distdir = "/usr/src/propellor"
distrepo :: FilePath 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 -- Using the github mirror of the main propellor repo because
-- it is accessible over https for better security. -- 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 let repo = if distexists then distrepo else netrepo
void $ boolSystem "git" [Param "clone", File repo, File propellordir] void $ boolSystem "git" [Param "clone", File repo, File propellordir]
disthead = propellordir </> "head"
checkRepo = whenM (doesFileExist disthead) $ do checkRepo = whenM (doesFileExist disthead) $ do
headrev <- readFile disthead headrev <- readFile disthead
changeWorkingDirectory propellordir changeWorkingDirectory propellordir
@ -75,6 +79,7 @@ wrapper args propellordir propellorbin = do
n ("** Your " ++ propellordir ++ " is out of date..") n ("** Your " ++ propellordir ++ " is out of date..")
n (" A newer upstream version is available in " ++ distrepo) n (" A newer upstream version is available in " ++ distrepo)
n (" To merge it, run eg: git pull origin master") n (" To merge it, run eg: git pull origin master")
n ""
buildruncfg = do buildruncfg = do
changeWorkingDirectory propellordir changeWorkingDirectory propellordir
ifM (boolSystem "make" [Param "build"]) ifM (boolSystem "make" [Param "build"])