summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-12-28 13:00:22 -0400
committerJoey Hess2016-12-28 13:00:22 -0400
commita695d7ef25a0cfaccb58ff1ec11f6aa970b3885f (patch)
treeebba44ff450bec038389471f59573f1092c6de10
parent1107f528e0ddbaf62c7a171c7da26b00afb18944 (diff)
parent289afbc22f3ac0f08b9c785ef4c8b996a404203f (diff)
Merge remote-tracking branch 'iabak/usage-message'
-rw-r--r--src/Propellor/CmdLine.hs46
1 files changed, 30 insertions, 16 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index f26e0834..a36ec7f5 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -24,22 +24,36 @@ import Utility.FileSystemEncoding
usage :: Handle -> IO ()
usage h = hPutStrLn h $ unlines
[ "Usage:"
- , " propellor --init"
- , " propellor"
- , " propellor --spin targethost [--via relayhost]"
- , " propellor --build"
- , " propellor --add-key keyid"
- , " propellor --rm-key keyid"
- , " propellor --list-fields"
- , " propellor --set field context"
- , " propellor --unset field context"
- , " propellor --unset-unused"
- , " propellor --dump field context"
- , " propellor --edit field context"
- , " propellor --merge"
- , " propellor --check"
- , " propellor hostname"
- ]
+ , " with no arguments, provision the current host"
+ , ""
+ , " --init"
+ , " initialize ~/.propellor"
+ , " hostname"
+ , " provision the current host as if it had the specified hostname"
+ , " --spin targethost [--via relayhost]"
+ , " provision the specified host"
+ , " --build"
+ , " recompile using your current config"
+ , " --add-key keyid"
+ , " add an additional signing key to the private data"
+ , " --rm-key keyid"
+ , " remove a signing key from the private data"
+ , " --list-fields"
+ , " list private data fields"
+ , " --set field context"
+ , " set a private data field"
+ , " --unset field context"
+ , " clear a private data field"
+ , " --unset-unused"
+ , " clear unused fields from the private data"
+ , " --dump field context"
+ , " show the content of a private data field"
+ , " --edit field context"
+ , " edit the content of a private data field"
+ , " --merge"
+ , " combine multiple spins into a single git commit"
+ , " --check"
+ , " double-check that propellor can actually run here"]
usageError :: [String] -> IO a
usageError ps = do