split out --all, add a table of example usages
diff --git a/SETUPMYMAC.md b/SETUPMYMAC.md
index 559cd3f..239b416 100644
--- a/SETUPMYMAC.md
+++ b/SETUPMYMAC.md
@@ -45,6 +45,29 @@
there are options to do that, enter `whimsy/config/setupmymac --help` for
details. Pass `--update-all` to update everything.
+Sample usages:
+
+| Command | Description |
+| ------- | ----------- |
+| setupmymac | Ensure that everything is installed, checked out, cloned |
+| setupmymac --svn | Ensure that everything is installed, update svn |
+| setupmymac --update-all | Ensure that everything is up to date |
+| setupmymac --update-all --no-svn | Ensure that everything is up to date, except for svn |
+| setupmymac --all | Ensure that everything is up to date and launched |
+| setupmymac --no-ws | Stop board agenda websocket daemon |
+| setupmymac --docker | Configure for docker usage |
+| setupmymac --docker --prune | Clean start container |
+| setupmymac --clean | Reset `/srv/whimsy` - **danger** may cause lost changes |
+| setupmymac --user | Set up webserver to run under your user id |
+| setupmymac --dry-run | show what commands would have been issued |
+
+Notes:
+
+* Two long running daemons (toucher and websocket) can be started with this and these daemons will continue to run and will restart on system restart until explicitly stopped.
+* Cleaning `/srv/whimsy` may be needed if you change your version of Ruby or Gems.
+* Running the web server under your user is, in general, not recommended but may be handy if you are running in to file permission problems setting up a test. Just remember to reset these file permissions by running `setupmymac` again.
+* Dry run may not be accurate as running commands may change the state of the system, affecting what subsequent commands are necessary.
+
If you want to know what is going on under the covers with the setupmymac
scripts, visit either the [macOS](./MACOSX.md) or [Docker](./DOCKER.md)
instructions.
diff --git a/config/setupmymac b/config/setupmymac
index 0f74d48..4019078 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -135,14 +135,10 @@
force[:minutes] = opt
end
- opts.on('--update-all', '--all', "Update and launch everything") do |opt|
+ opts.on('--update-all', "Update everything") do |opt|
force.default = true
end
- opts.on('--[no-]clean', "Clean up source directory") do |opt|
- force[:clean] = opt
- end
-
opts.on('--[no-]toucher', "Restart rack applications on source change") do |opt|
force[:toucher] = opt
end
@@ -151,6 +147,16 @@
force[:ws] = opt
end
+ opts.on('--all', "Update and launch everything") do |opt|
+ force[:ws] = true if force[:ws] == nil
+ force[:toucher] = true if force[:toucher] == nil
+ force.default = true
+ end
+
+ opts.on('--[no-]clean', "Clean up source directory") do |opt|
+ force[:clean] = opt
+ end
+
opts.on('--[no-]prune', "Prune docker containers and images") do |opt|
force[:prune] = opt
end
