From 11c1160655f64df8586b7e299a22b9befb4e0ef1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Aug 2014 18:06:00 -0400 Subject: reorg manpage --- debian/manpages | 1 + debian/propellor.1 | 15 --------------- propellor.1 | 15 +++++++++++++++ propellor.cabal | 3 ++- 4 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 debian/manpages delete mode 100644 debian/propellor.1 create mode 100644 propellor.1 diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 00000000..263e13a3 --- /dev/null +++ b/debian/manpages @@ -0,0 +1 @@ +propellor.1 diff --git a/debian/propellor.1 b/debian/propellor.1 deleted file mode 100644 index 3ee3bf4a..00000000 --- a/debian/propellor.1 +++ /dev/null @@ -1,15 +0,0 @@ -.\" -*- nroff -*- -.TH propellor 1 "Commands" -.SH NAME -propellor \- property-based host configuration management in haskell -.SH SYNOPSIS -.B propellor [options] host -.SH DESCRIPTION -.I propellor -is a property-based host configuration management program written -and configured in haskell. -.PP -The first time you run propellor, it will set up a ~/.propellor/ -repository. Edit ~/.propellor/config.hs to configure it. -.SH AUTHOR -Joey Hess diff --git a/propellor.1 b/propellor.1 new file mode 100644 index 00000000..3ee3bf4a --- /dev/null +++ b/propellor.1 @@ -0,0 +1,15 @@ +.\" -*- nroff -*- +.TH propellor 1 "Commands" +.SH NAME +propellor \- property-based host configuration management in haskell +.SH SYNOPSIS +.B propellor [options] host +.SH DESCRIPTION +.I propellor +is a property-based host configuration management program written +and configured in haskell. +.PP +The first time you run propellor, it will set up a ~/.propellor/ +repository. Edit ~/.propellor/config.hs to configure it. +.SH AUTHOR +Joey Hess diff --git a/propellor.cabal b/propellor.cabal index c492fb66..9f33dd81 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -18,13 +18,14 @@ Extra-Source-Files: config-simple.hs config-joey.hs config.hs + propellor.1 debian/changelog debian/README.Debian - debian/propellor.1 debian/compat debian/control debian/copyright debian/rules + debian/manpages Synopsis: property-based host configuration management in haskell Description: Propellor enures that the system it's run in satisfies a list of -- cgit v1.2.3 From db1cf96dd70c3f7396b6a3bb89f26b972cc54e0c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Aug 2014 19:03:05 -0400 Subject: remove origin remote after local clone It's not useful, since it'll change to something that cannot be directly merged with. --- src/wrapper.hs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/wrapper.hs b/src/wrapper.hs index 75830e72..106591fc 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -71,6 +71,8 @@ wrapper args propellordir propellorbin = do ( do void $ boolSystem "git" [Param "clone", File distrepo, File propellordir] fetchUpstreamBranch propellordir distrepo + changeWorkingDirectory propellordir + void $ boolSystem "git" [Param "remote", Param "rm", Param "origin"] , void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir] ) -- cgit v1.2.3