diff --git a/README.md b/README.md index 1f5c2d1..94d4e78 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Here are some of the common commands you may want to try right off the bat (asid ```bash export MAKESHIFT_HOST=localhost export MAKESHIFT_PATH=/test -export MAKESHIFT_ROOT=./test +export MAKESHIFT_SERVER_ROOT=./test ``` Start the server. The `--init` flag with create the default files and directory to get started at the `--root` path. diff --git a/cmd/run.go b/cmd/run.go index 399aa83..f932e07 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -3,19 +3,8 @@ package cmd import "github.com/spf13/cobra" var runCmd = &cobra.Command{ - Use: "run", - Example: ` - # set up environment - export MAKESHIFT_HOST=http://localhost:5050 - export MAKESHIFT_PATH=help.txt - export MAKESHIFT_ROOT=./test - - # run locally similar to 'download' - makeshift run --plugins jinja2 --profiles default - makeshift run --root ./test -p help.txt --plugins jinja2 --profiles default -`, - Args: cobra.NoArgs, - Short: "Run locally with plugins and profiles", + Use: "run", + Short: "Run 'makeshift' locally with plugins", Run: func(cmd *cobra.Command, args []string) { }, diff --git a/cmd/serve.go b/cmd/serve.go index b8a34be..252a085 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -21,7 +21,7 @@ var serveCmd = &cobra.Command{ Args: cobra.NoArgs, PreRun: func(cmd *cobra.Command, args []string) { setenv(cmd, "host", "MAKESHIFT_HOST") - setenv(cmd, "root", "MAKESHIFT_ROOT") + setenv(cmd, "root", "MAKESHIFT_SERVER_ROOT") setenv(cmd, "timeout", "MAKESHIFT_TIMEOUT") }, Run: func(cmd *cobra.Command, args []string) { diff --git a/pkg/service/constants.go b/pkg/service/constants.go index 68c2953..3767260 100644 --- a/pkg/service/constants.go +++ b/pkg/service/constants.go @@ -33,7 +33,7 @@ const ( # setup environment variables
export MAKESHIFT_HOST={{ makeshift.profiles.default.data.host }}
export MAKESHIFT_PATH={{ makeshift.profiles.default.data.path }}
- export MAKESHIFT_ROOT={{ makeshift.profiles.default.data.server_root }}

+ export MAKESHIFT_SERVER_ROOT={{ makeshift.profiles.default.data.server_root }}

# start the service
makeshift serve --root ./tests --init -l debug