From 817375402d8a75612ee85eeddf96154e5c21ca66 Mon Sep 17 00:00:00 2001 From: Mathieu Frenette Date: Mon, 18 Apr 2022 11:33:01 -0400 Subject: [PATCH] Fix package name to allow using `go install...` --- go.mod | 2 +- src/cmd/do/do.go | 4 ++-- src/cmd/exec/exec.go | 6 +++--- src/cmd/export/export.go | 2 +- src/cmd/internal/internal.go | 12 +++++------ src/cmd/list/actions/actions.go | 2 +- src/cmd/list/list.go | 10 +++++----- src/cmd/list/scripts/scripts.go | 2 +- src/cmd/list/templates/templates.go | 6 +++--- src/cmd/list/vars/vars.go | 2 +- src/cmd/pull/pull.go | 4 ++-- src/cmd/require/require.go | 2 +- src/cmd/root.go | 18 ++++++++--------- src/cmd/shell/shell.go | 4 ++-- src/internal/evaluation/render.go | 2 +- src/internal/helpers/variables/variables.go | 2 +- src/internal/home/home.go | 8 ++++---- src/internal/project/project.go | 8 ++++---- src/internal/shell/shell.go | 2 +- src/internal/spec/action.go | 4 ++-- src/internal/spec/spec.go | 22 ++++++++++----------- src/internal/spec/spec_test.go | 20 +++++++++---------- src/internal/steps/choice/choice.go | 4 ++-- src/internal/steps/confirm.go | 6 +++--- src/internal/steps/do/do.go | 2 +- src/internal/steps/exec/exec.go | 4 ++-- src/internal/steps/if.go | 6 +++--- src/internal/steps/input/input.go | 6 +++--- src/internal/steps/option/option.go | 6 +++--- src/internal/steps/options/options.go | 6 +++--- src/internal/steps/render/render.go | 4 ++-- src/internal/steps/set/set.go | 6 +++--- src/main.go | 2 +- 33 files changed, 98 insertions(+), 98 deletions(-) diff --git a/go.mod b/go.mod index efc7766..2ea7e2b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Samasource/jen +module github.com/silphid/jen go 1.16 diff --git a/src/cmd/do/do.go b/src/cmd/do/do.go index 2b47c3a..7f7d902 100644 --- a/src/cmd/do/do.go +++ b/src/cmd/do/do.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/AlecAivazis/survey/v2" - "github.com/Samasource/jen/src/cmd/internal" - "github.com/Samasource/jen/src/internal/exec" + "github.com/silphid/jen/src/cmd/internal" + "github.com/silphid/jen/src/internal/exec" "github.com/spf13/cobra" ) diff --git a/src/cmd/exec/exec.go b/src/cmd/exec/exec.go index 1247f78..d23c98d 100644 --- a/src/cmd/exec/exec.go +++ b/src/cmd/exec/exec.go @@ -4,9 +4,9 @@ import ( "strings" "github.com/AlecAivazis/survey/v2" - "github.com/Samasource/jen/src/cmd/internal" - "github.com/Samasource/jen/src/internal/exec" - "github.com/Samasource/jen/src/internal/shell" + "github.com/silphid/jen/src/cmd/internal" + "github.com/silphid/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/shell" "github.com/spf13/cobra" ) diff --git a/src/cmd/export/export.go b/src/cmd/export/export.go index 3063240..623c164 100644 --- a/src/cmd/export/export.go +++ b/src/cmd/export/export.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/Samasource/jen/src/cmd/internal" + "github.com/silphid/jen/src/cmd/internal" "github.com/spf13/cobra" ) diff --git a/src/cmd/internal/internal.go b/src/cmd/internal/internal.go index bc25845..eadb886 100644 --- a/src/cmd/internal/internal.go +++ b/src/cmd/internal/internal.go @@ -8,12 +8,12 @@ import ( "sort" "strings" - "github.com/Samasource/jen/src/internal/exec" - "github.com/Samasource/jen/src/internal/helpers" - "github.com/Samasource/jen/src/internal/home" - "github.com/Samasource/jen/src/internal/logging" - "github.com/Samasource/jen/src/internal/project" - "github.com/Samasource/jen/src/internal/spec" + "github.com/silphid/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/helpers" + "github.com/silphid/jen/src/internal/home" + "github.com/silphid/jen/src/internal/logging" + "github.com/silphid/jen/src/internal/project" + "github.com/silphid/jen/src/internal/spec" ) // Options represents all command line configurations diff --git a/src/cmd/list/actions/actions.go b/src/cmd/list/actions/actions.go index 69ff9c8..df86fd6 100644 --- a/src/cmd/list/actions/actions.go +++ b/src/cmd/list/actions/actions.go @@ -3,7 +3,7 @@ package actions import ( "fmt" - "github.com/Samasource/jen/src/cmd/internal" + "github.com/silphid/jen/src/cmd/internal" "github.com/spf13/cobra" ) diff --git a/src/cmd/list/list.go b/src/cmd/list/list.go index 039a436..2b7b005 100644 --- a/src/cmd/list/list.go +++ b/src/cmd/list/list.go @@ -1,11 +1,11 @@ package list import ( - "github.com/Samasource/jen/src/cmd/internal" - "github.com/Samasource/jen/src/cmd/list/actions" - "github.com/Samasource/jen/src/cmd/list/scripts" - "github.com/Samasource/jen/src/cmd/list/templates" - "github.com/Samasource/jen/src/cmd/list/vars" + "github.com/silphid/jen/src/cmd/internal" + "github.com/silphid/jen/src/cmd/list/actions" + "github.com/silphid/jen/src/cmd/list/scripts" + "github.com/silphid/jen/src/cmd/list/templates" + "github.com/silphid/jen/src/cmd/list/vars" "github.com/spf13/cobra" ) diff --git a/src/cmd/list/scripts/scripts.go b/src/cmd/list/scripts/scripts.go index 8b537bb..9b07a05 100644 --- a/src/cmd/list/scripts/scripts.go +++ b/src/cmd/list/scripts/scripts.go @@ -3,7 +3,7 @@ package scripts import ( "fmt" - "github.com/Samasource/jen/src/cmd/internal" + "github.com/silphid/jen/src/cmd/internal" "github.com/spf13/cobra" ) diff --git a/src/cmd/list/templates/templates.go b/src/cmd/list/templates/templates.go index 6e790fd..d801c57 100644 --- a/src/cmd/list/templates/templates.go +++ b/src/cmd/list/templates/templates.go @@ -6,9 +6,9 @@ import ( "path/filepath" "strings" - "github.com/Samasource/jen/src/cmd/internal" - "github.com/Samasource/jen/src/internal/home" - "github.com/Samasource/jen/src/internal/spec" + "github.com/silphid/jen/src/cmd/internal" + "github.com/silphid/jen/src/internal/home" + "github.com/silphid/jen/src/internal/spec" "github.com/spf13/cobra" ) diff --git a/src/cmd/list/vars/vars.go b/src/cmd/list/vars/vars.go index cbc30e2..58c3a9c 100644 --- a/src/cmd/list/vars/vars.go +++ b/src/cmd/list/vars/vars.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/Samasource/jen/src/cmd/internal" + "github.com/silphid/jen/src/cmd/internal" "github.com/spf13/cobra" ) diff --git a/src/cmd/pull/pull.go b/src/cmd/pull/pull.go index a9d839c..6b85bde 100644 --- a/src/cmd/pull/pull.go +++ b/src/cmd/pull/pull.go @@ -1,8 +1,8 @@ package pull import ( - "github.com/Samasource/jen/src/internal/home" - "github.com/Samasource/jen/src/internal/shell" + "github.com/silphid/jen/src/internal/home" + "github.com/silphid/jen/src/internal/shell" "github.com/spf13/cobra" ) diff --git a/src/cmd/require/require.go b/src/cmd/require/require.go index 4b1481e..e85be09 100644 --- a/src/cmd/require/require.go +++ b/src/cmd/require/require.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/Samasource/jen/src/cmd/internal" + "github.com/silphid/jen/src/cmd/internal" "github.com/spf13/cobra" ) diff --git a/src/cmd/root.go b/src/cmd/root.go index e85b523..2159be8 100644 --- a/src/cmd/root.go +++ b/src/cmd/root.go @@ -1,15 +1,15 @@ package cmd import ( - "github.com/Samasource/jen/src/cmd/do" - "github.com/Samasource/jen/src/cmd/exec" - "github.com/Samasource/jen/src/cmd/export" - "github.com/Samasource/jen/src/cmd/internal" - "github.com/Samasource/jen/src/cmd/pull" - "github.com/Samasource/jen/src/cmd/require" - "github.com/Samasource/jen/src/cmd/shell" - "github.com/Samasource/jen/src/cmd/versioning" - "github.com/Samasource/jen/src/internal/logging" + "github.com/silphid/jen/src/cmd/do" + "github.com/silphid/jen/src/cmd/exec" + "github.com/silphid/jen/src/cmd/export" + "github.com/silphid/jen/src/cmd/internal" + "github.com/silphid/jen/src/cmd/pull" + "github.com/silphid/jen/src/cmd/require" + "github.com/silphid/jen/src/cmd/shell" + "github.com/silphid/jen/src/cmd/versioning" + "github.com/silphid/jen/src/internal/logging" "github.com/spf13/cobra" ) diff --git a/src/cmd/shell/shell.go b/src/cmd/shell/shell.go index 5ae74d2..6577ab3 100644 --- a/src/cmd/shell/shell.go +++ b/src/cmd/shell/shell.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/Samasource/jen/src/cmd/internal" - "github.com/Samasource/jen/src/internal/shell" + "github.com/silphid/jen/src/cmd/internal" + "github.com/silphid/jen/src/internal/shell" "github.com/spf13/cobra" ) diff --git a/src/internal/evaluation/render.go b/src/internal/evaluation/render.go index fbfd18e..b8c648d 100644 --- a/src/internal/evaluation/render.go +++ b/src/internal/evaluation/render.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/Samasource/jen/src/internal/logging" + "github.com/silphid/jen/src/internal/logging" ) // Render copies all files from inputDir into outputDir, rendering as templates those for which rendering is enabled diff --git a/src/internal/helpers/variables/variables.go b/src/internal/helpers/variables/variables.go index b6ce9dc..9764b95 100644 --- a/src/internal/helpers/variables/variables.go +++ b/src/internal/helpers/variables/variables.go @@ -1,6 +1,6 @@ package variables -import "github.com/Samasource/jen/src/internal/helpers/conversion" +import "github.com/silphid/jen/src/internal/helpers/conversion" // TryGetString tries to fetch given variable from map and return it as a string, // also returning whether the variable was successfully found and converted. diff --git a/src/internal/home/home.go b/src/internal/home/home.go index 3a9699b..d4ca2dc 100644 --- a/src/internal/home/home.go +++ b/src/internal/home/home.go @@ -6,11 +6,11 @@ import ( "os" "path/filepath" - "github.com/Samasource/jen/src/internal/constant" - "github.com/Samasource/jen/src/internal/helpers" - "github.com/Samasource/jen/src/internal/logging" - "github.com/Samasource/jen/src/internal/shell" "github.com/mitchellh/go-homedir" + "github.com/silphid/jen/src/internal/constant" + "github.com/silphid/jen/src/internal/helpers" + "github.com/silphid/jen/src/internal/logging" + "github.com/silphid/jen/src/internal/shell" ) const ( diff --git a/src/internal/project/project.go b/src/internal/project/project.go index 0c6f7a1..97cded4 100644 --- a/src/internal/project/project.go +++ b/src/internal/project/project.go @@ -9,10 +9,10 @@ import ( "strings" survey "github.com/AlecAivazis/survey/v2" - "github.com/Samasource/jen/src/internal/constant" - "github.com/Samasource/jen/src/internal/helpers" - "github.com/Samasource/jen/src/internal/home" - "github.com/Samasource/jen/src/internal/spec" + "github.com/silphid/jen/src/internal/constant" + "github.com/silphid/jen/src/internal/helpers" + "github.com/silphid/jen/src/internal/home" + "github.com/silphid/jen/src/internal/spec" "gopkg.in/yaml.v2" ) diff --git a/src/internal/shell/shell.go b/src/internal/shell/shell.go index 490ad2e..0e75d5c 100644 --- a/src/internal/shell/shell.go +++ b/src/internal/shell/shell.go @@ -5,7 +5,7 @@ import ( "os/exec" "strings" - "github.com/Samasource/jen/src/internal/logging" + "github.com/silphid/jen/src/internal/logging" ) // Execute executes one or multiple shell commands, given specific env vars (defaults to process' env vars if nil) diff --git a/src/internal/spec/action.go b/src/internal/spec/action.go index 4e4f565..fe37e5c 100644 --- a/src/internal/spec/action.go +++ b/src/internal/spec/action.go @@ -1,8 +1,8 @@ package spec import ( - "github.com/Samasource/jen/src/internal/exec" - logging "github.com/Samasource/jen/src/internal/logging" + "github.com/silphid/jen/src/internal/exec" + logging "github.com/silphid/jen/src/internal/logging" ) // Action represents a named executable that can be invoked from the diff --git a/src/internal/spec/spec.go b/src/internal/spec/spec.go index a09ec87..a94b0ae 100644 --- a/src/internal/spec/spec.go +++ b/src/internal/spec/spec.go @@ -4,18 +4,18 @@ import ( "fmt" "path/filepath" - "github.com/Samasource/jen/src/internal/constant" - "github.com/Samasource/jen/src/internal/exec" - "github.com/Samasource/jen/src/internal/steps" - "github.com/Samasource/jen/src/internal/steps/choice" - "github.com/Samasource/jen/src/internal/steps/do" - execstep "github.com/Samasource/jen/src/internal/steps/exec" - "github.com/Samasource/jen/src/internal/steps/input" - "github.com/Samasource/jen/src/internal/steps/option" - "github.com/Samasource/jen/src/internal/steps/options" - "github.com/Samasource/jen/src/internal/steps/render" - "github.com/Samasource/jen/src/internal/steps/set" "github.com/kylelemons/go-gypsy/yaml" + "github.com/silphid/jen/src/internal/constant" + "github.com/silphid/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/steps" + "github.com/silphid/jen/src/internal/steps/choice" + "github.com/silphid/jen/src/internal/steps/do" + execstep "github.com/silphid/jen/src/internal/steps/exec" + "github.com/silphid/jen/src/internal/steps/input" + "github.com/silphid/jen/src/internal/steps/option" + "github.com/silphid/jen/src/internal/steps/options" + "github.com/silphid/jen/src/internal/steps/render" + "github.com/silphid/jen/src/internal/steps/set" ) // Spec represents a template specification file found in the root of the template's dir diff --git a/src/internal/spec/spec_test.go b/src/internal/spec/spec_test.go index 6acf585..1bb38f4 100644 --- a/src/internal/spec/spec_test.go +++ b/src/internal/spec/spec_test.go @@ -4,18 +4,18 @@ import ( "strings" "testing" - "github.com/Samasource/jen/src/internal/exec" - "github.com/Samasource/jen/src/internal/steps" - "github.com/Samasource/jen/src/internal/steps/choice" - "github.com/Samasource/jen/src/internal/steps/do" - execstep "github.com/Samasource/jen/src/internal/steps/exec" - "github.com/Samasource/jen/src/internal/steps/input" - "github.com/Samasource/jen/src/internal/steps/option" - "github.com/Samasource/jen/src/internal/steps/options" - "github.com/Samasource/jen/src/internal/steps/render" - "github.com/Samasource/jen/src/internal/steps/set" "github.com/go-test/deep" "github.com/kylelemons/go-gypsy/yaml" + "github.com/silphid/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/steps" + "github.com/silphid/jen/src/internal/steps/choice" + "github.com/silphid/jen/src/internal/steps/do" + execstep "github.com/silphid/jen/src/internal/steps/exec" + "github.com/silphid/jen/src/internal/steps/input" + "github.com/silphid/jen/src/internal/steps/option" + "github.com/silphid/jen/src/internal/steps/options" + "github.com/silphid/jen/src/internal/steps/render" + "github.com/silphid/jen/src/internal/steps/set" "github.com/stretchr/testify/assert" ) diff --git a/src/internal/steps/choice/choice.go b/src/internal/steps/choice/choice.go index b1297e8..2a85c5e 100644 --- a/src/internal/steps/choice/choice.go +++ b/src/internal/steps/choice/choice.go @@ -2,8 +2,8 @@ package choice import ( "github.com/AlecAivazis/survey/v2" - "github.com/Samasource/jen/src/internal/evaluation" - "github.com/Samasource/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/evaluation" + "github.com/silphid/jen/src/internal/exec" ) // Item represent one of the multiple choices prompted to user diff --git a/src/internal/steps/confirm.go b/src/internal/steps/confirm.go index 47291bb..6269fae 100644 --- a/src/internal/steps/confirm.go +++ b/src/internal/steps/confirm.go @@ -2,9 +2,9 @@ package steps import ( "github.com/AlecAivazis/survey/v2" - "github.com/Samasource/jen/src/internal/evaluation" - "github.com/Samasource/jen/src/internal/exec" - logging "github.com/Samasource/jen/src/internal/logging" + "github.com/silphid/jen/src/internal/evaluation" + "github.com/silphid/jen/src/internal/exec" + logging "github.com/silphid/jen/src/internal/logging" ) // Confirm represents a conditional step that executes its child executable only if diff --git a/src/internal/steps/do/do.go b/src/internal/steps/do/do.go index bfa20fe..e3fa856 100644 --- a/src/internal/steps/do/do.go +++ b/src/internal/steps/do/do.go @@ -3,7 +3,7 @@ package do import ( "fmt" - "github.com/Samasource/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/exec" ) // Do represents a reference to another action within same spec file to which diff --git a/src/internal/steps/exec/exec.go b/src/internal/steps/exec/exec.go index 1a61947..b5886f5 100644 --- a/src/internal/steps/exec/exec.go +++ b/src/internal/steps/exec/exec.go @@ -1,8 +1,8 @@ package exec import ( - "github.com/Samasource/jen/src/internal/exec" - "github.com/Samasource/jen/src/internal/shell" + "github.com/silphid/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/shell" ) // Exec represent a set of shell commands diff --git a/src/internal/steps/if.go b/src/internal/steps/if.go index 0de6791..27bf323 100644 --- a/src/internal/steps/if.go +++ b/src/internal/steps/if.go @@ -3,9 +3,9 @@ package steps import ( "fmt" - "github.com/Samasource/jen/src/internal/evaluation" - "github.com/Samasource/jen/src/internal/exec" - logging "github.com/Samasource/jen/src/internal/logging" + "github.com/silphid/jen/src/internal/evaluation" + "github.com/silphid/jen/src/internal/exec" + logging "github.com/silphid/jen/src/internal/logging" ) // If represents a conditional step that executes its child executable only if diff --git a/src/internal/steps/input/input.go b/src/internal/steps/input/input.go index 02f7cb4..e2f2f0a 100644 --- a/src/internal/steps/input/input.go +++ b/src/internal/steps/input/input.go @@ -2,9 +2,9 @@ package input import ( "github.com/AlecAivazis/survey/v2" - "github.com/Samasource/jen/src/internal/evaluation" - "github.com/Samasource/jen/src/internal/exec" - "github.com/Samasource/jen/src/internal/helpers/variables" + "github.com/silphid/jen/src/internal/evaluation" + "github.com/silphid/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/helpers/variables" ) // Prompt represents a single text input user prompt diff --git a/src/internal/steps/option/option.go b/src/internal/steps/option/option.go index 4070b73..a035e8a 100644 --- a/src/internal/steps/option/option.go +++ b/src/internal/steps/option/option.go @@ -2,9 +2,9 @@ package option import ( "github.com/AlecAivazis/survey/v2" - "github.com/Samasource/jen/src/internal/evaluation" - "github.com/Samasource/jen/src/internal/exec" - "github.com/Samasource/jen/src/internal/helpers/variables" + "github.com/silphid/jen/src/internal/evaluation" + "github.com/silphid/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/helpers/variables" ) // Prompt represents a boolean user prompt diff --git a/src/internal/steps/options/options.go b/src/internal/steps/options/options.go index c84949a..45918a4 100644 --- a/src/internal/steps/options/options.go +++ b/src/internal/steps/options/options.go @@ -2,9 +2,9 @@ package options import ( "github.com/AlecAivazis/survey/v2" - "github.com/Samasource/jen/src/internal/evaluation" - "github.com/Samasource/jen/src/internal/exec" - "github.com/Samasource/jen/src/internal/helpers/variables" + "github.com/silphid/jen/src/internal/evaluation" + "github.com/silphid/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/helpers/variables" ) // Item represent one of the multiple boolean values prompted to user diff --git a/src/internal/steps/render/render.go b/src/internal/steps/render/render.go index 53d3c65..9954986 100644 --- a/src/internal/steps/render/render.go +++ b/src/internal/steps/render/render.go @@ -3,8 +3,8 @@ package render import ( "path/filepath" - "github.com/Samasource/jen/src/internal/evaluation" - "github.com/Samasource/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/evaluation" + "github.com/silphid/jen/src/internal/exec" ) // Render represents an executable that renders a given source sub-folder diff --git a/src/internal/steps/set/set.go b/src/internal/steps/set/set.go index aa94c50..2881c91 100644 --- a/src/internal/steps/set/set.go +++ b/src/internal/steps/set/set.go @@ -1,9 +1,9 @@ package set import ( - "github.com/Samasource/jen/src/internal/evaluation" - "github.com/Samasource/jen/src/internal/exec" - "github.com/Samasource/jen/src/internal/helpers/variables" + "github.com/silphid/jen/src/internal/evaluation" + "github.com/silphid/jen/src/internal/exec" + "github.com/silphid/jen/src/internal/helpers/variables" ) // Variable represents a single variable to be set to a given value diff --git a/src/main.go b/src/main.go index 6c54061..0303020 100644 --- a/src/main.go +++ b/src/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/Samasource/jen/src/cmd" + "github.com/silphid/jen/src/cmd" ) var version string