Merge pull request #405 from jacobbednarz/fix-variables-spelling

thank you!
This commit is contained in:
Shlomi Noach 2017-06-29 20:55:13 +03:00 committed by GitHub
commit 31005ac706

View File

@ -47,7 +47,7 @@ func (this *HooksExecutor) initHooks() error {
return nil return nil
} }
func (this *HooksExecutor) applyEnvironmentVairables(extraVariables ...string) []string { func (this *HooksExecutor) applyEnvironmentVariables(extraVariables ...string) []string {
env := os.Environ() env := os.Environ()
env = append(env, fmt.Sprintf("GH_OST_DATABASE_NAME=%s", this.migrationContext.DatabaseName)) env = append(env, fmt.Sprintf("GH_OST_DATABASE_NAME=%s", this.migrationContext.DatabaseName))
env = append(env, fmt.Sprintf("GH_OST_TABLE_NAME=%s", this.migrationContext.OriginalTableName)) env = append(env, fmt.Sprintf("GH_OST_TABLE_NAME=%s", this.migrationContext.OriginalTableName))
@ -75,7 +75,7 @@ func (this *HooksExecutor) applyEnvironmentVairables(extraVariables ...string) [
// combined output & error are printed to gh-ost's standard error. // combined output & error are printed to gh-ost's standard error.
func (this *HooksExecutor) executeHook(hook string, extraVariables ...string) error { func (this *HooksExecutor) executeHook(hook string, extraVariables ...string) error {
cmd := exec.Command(hook) cmd := exec.Command(hook)
cmd.Env = this.applyEnvironmentVairables(extraVariables...) cmd.Env = this.applyEnvironmentVariables(extraVariables...)
combinedOutput, err := cmd.CombinedOutput() combinedOutput, err := cmd.CombinedOutput()
fmt.Fprintln(os.Stderr, string(combinedOutput)) fmt.Fprintln(os.Stderr, string(combinedOutput))