Merge pull request #132 from JohannesKaufmann/move-cli-command

move-cli-command
JohannesKaufmann · Dec 27, 2024 · 14e6105 · 14e6105
2 parents d904841 + bbb7d5b
commit 14e6105
Show file tree

Hide file tree

Showing 63 changed files with 3 additions and 3 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -20,7 +20,7 @@ builds:
 
     # Note: We only use goreleaser for the CLI,
     # so we have to go into the "cli" directory.
-    dir: cli
+    dir: cli/html2markdown
     binary: html2markdown
 
 archives:

diff --git a/README.md b/README.md
@@ -240,7 +240,7 @@ Binaries are automatically built via [GoReleaser](https://goreleaser.com/) and a
 To build locally (requires Go):
 
 ```bash
-go build -o html2markdown ./cli
+go build ./cli/html2markdown
 ```
 
 ### Version

diff --git a/cli/cmd/cli_run.go → cli/html2markdown/cmd/cli_run.go b/cli/cmd/cli_run.go → cli/html2markdown/cmd/cli_run.go
diff --git a/cli/cmd/cmd_convert.go → cli/html2markdown/cmd/cmd_convert.go b/cli/cmd/cmd_convert.go → cli/html2markdown/cmd/cmd_convert.go
diff --git a/cli/cmd/cmd_help.go → cli/html2markdown/cmd/cmd_help.go b/cli/cmd/cmd_help.go → cli/html2markdown/cmd/cmd_help.go
diff --git a/cli/cmd/cmd_version.go → cli/html2markdown/cmd/cmd_version.go b/cli/cmd/cmd_version.go → cli/html2markdown/cmd/cmd_version.go
diff --git a/cli/cmd/errors.go → cli/html2markdown/cmd/errors.go b/cli/cmd/errors.go → cli/html2markdown/cmd/errors.go
diff --git a/cli/cmd/exec.go → cli/html2markdown/cmd/exec.go b/cli/cmd/exec.go → cli/html2markdown/cmd/exec.go
diff --git a/cli/cmd/exec_test.go → cli/html2markdown/cmd/exec_test.go b/cli/cmd/exec_test.go → cli/html2markdown/cmd/exec_test.go
diff --git a/cli/cmd/flags.go → cli/html2markdown/cmd/flags.go b/cli/cmd/flags.go → cli/html2markdown/cmd/flags.go
diff --git a/cli/cmd/flags_categorize.go → cli/html2markdown/cmd/flags_categorize.go b/cli/cmd/flags_categorize.go → cli/html2markdown/cmd/flags_categorize.go
diff --git a/cli/cmd/print.go → cli/html2markdown/cmd/print.go b/cli/cmd/print.go → cli/html2markdown/cmd/print.go
diff --git a/cli/cmd/testdata/.gitattributes → ...html2markdown/cmd/testdata/.gitattributes b/cli/cmd/testdata/.gitattributes → ...html2markdown/cmd/testdata/.gitattributes
diff --git a/...ute/[argument_unknown]_html/stderr.golden → ...ute/[argument_unknown]_html/stderr.golden b/...ute/[argument_unknown]_html/stderr.golden → ...ute/[argument_unknown]_html/stderr.golden
diff --git a/...ute/[argument_unknown]_html/stdout.golden → ...ute/[argument_unknown]_html/stdout.golden b/...ute/[argument_unknown]_html/stdout.golden → ...ute/[argument_unknown]_html/stdout.golden
diff --git a/...ment_unknown]_list_of_files/stderr.golden → ...ment_unknown]_list_of_files/stderr.golden b/...ment_unknown]_list_of_files/stderr.golden → ...ment_unknown]_list_of_files/stderr.golden
diff --git a/...ment_unknown]_list_of_files/stdout.golden → ...ment_unknown]_list_of_files/stdout.golden b/...ment_unknown]_list_of_files/stdout.golden → ...ment_unknown]_list_of_files/stdout.golden
diff --git a/...gument_unknown]_long_string/stderr.golden → ...gument_unknown]_long_string/stderr.golden b/...gument_unknown]_long_string/stderr.golden → ...gument_unknown]_long_string/stderr.golden
diff --git a/...gument_unknown]_long_string/stdout.golden → ...gument_unknown]_long_string/stdout.golden b/...gument_unknown]_long_string/stdout.golden → ...gument_unknown]_long_string/stdout.golden
diff --git a/.../[argument_unknown]_version/stderr.golden → .../[argument_unknown]_version/stderr.golden b/.../[argument_unknown]_version/stderr.golden → .../[argument_unknown]_version/stderr.golden
diff --git a/.../[argument_unknown]_version/stdout.golden → .../[argument_unknown]_version/stdout.golden b/.../[argument_unknown]_version/stdout.golden → .../[argument_unknown]_version/stdout.golden
diff --git a/...tExecute/[convert]_collapse/stderr.golden → ...tExecute/[convert]_collapse/stderr.golden b/...tExecute/[convert]_collapse/stderr.golden → ...tExecute/[convert]_collapse/stderr.golden
diff --git a/...tExecute/[convert]_collapse/stdout.golden → ...tExecute/[convert]_collapse/stdout.golden b/...tExecute/[convert]_collapse/stdout.golden → ...tExecute/[convert]_collapse/stdout.golden
diff --git a/...te/[convert]_strong_default/stderr.golden → ...te/[convert]_strong_default/stderr.golden b/...te/[convert]_strong_default/stderr.golden → ...te/[convert]_strong_default/stderr.golden
diff --git a/...te/[convert]_strong_default/stdout.golden → ...te/[convert]_strong_default/stdout.golden b/...te/[convert]_strong_default/stdout.golden → ...te/[convert]_strong_default/stdout.golden
diff --git a/...rt]_strong_equal_underscore/stderr.golden → ...rt]_strong_equal_underscore/stderr.golden b/...rt]_strong_equal_underscore/stderr.golden → ...rt]_strong_equal_underscore/stderr.golden
diff --git a/...rt]_strong_equal_underscore/stdout.golden → ...rt]_strong_equal_underscore/stdout.golden b/...rt]_strong_equal_underscore/stdout.golden → ...rt]_strong_equal_underscore/stdout.golden
diff --git a/...rt]_strong_space_underscore/stderr.golden → ...rt]_strong_space_underscore/stderr.golden b/...rt]_strong_space_underscore/stderr.golden → ...rt]_strong_space_underscore/stderr.golden
diff --git a/...rt]_strong_space_underscore/stdout.golden → ...rt]_strong_space_underscore/stdout.golden b/...rt]_strong_space_underscore/stdout.golden → ...rt]_strong_space_underscore/stdout.golden
diff --git a/...-selector]_exclude_multiple/stderr.golden → ...-selector]_exclude_multiple/stderr.golden b/...-selector]_exclude_multiple/stderr.golden → ...-selector]_exclude_multiple/stderr.golden
diff --git a/...-selector]_exclude_multiple/stdout.golden → ...-selector]_exclude_multiple/stdout.golden b/...-selector]_exclude_multiple/stdout.golden → ...-selector]_exclude_multiple/stdout.golden
diff --git a/...flag_misspelled]_underscore/stderr.golden → ...flag_misspelled]_underscore/stderr.golden b/...flag_misspelled]_underscore/stderr.golden → ...flag_misspelled]_underscore/stderr.golden
diff --git a/...flag_misspelled]_underscore/stdout.golden → ...flag_misspelled]_underscore/stdout.golden b/...flag_misspelled]_underscore/stdout.golden → ...flag_misspelled]_underscore/stdout.golden
diff --git a/...te/[flag_unknown]_with_pipe/stderr.golden → ...te/[flag_unknown]_with_pipe/stderr.golden b/...te/[flag_unknown]_with_pipe/stderr.golden → ...te/[flag_unknown]_with_pipe/stderr.golden
diff --git a/...te/[flag_unknown]_with_pipe/stdout.golden → ...te/[flag_unknown]_with_pipe/stdout.golden b/...te/[flag_unknown]_with_pipe/stdout.golden → ...te/[flag_unknown]_with_pipe/stdout.golden
diff --git a/...flag_unknown]_with_terminal/stderr.golden → ...flag_unknown]_with_terminal/stderr.golden b/...flag_unknown]_with_terminal/stderr.golden → ...flag_unknown]_with_terminal/stderr.golden
diff --git a/...flag_unknown]_with_terminal/stdout.golden → ...flag_unknown]_with_terminal/stdout.golden b/...flag_unknown]_with_terminal/stdout.golden → ...flag_unknown]_with_terminal/stdout.golden
diff --git a/...Execute/[general]_help_pipe/stderr.golden → ...Execute/[general]_help_pipe/stderr.golden b/...Execute/[general]_help_pipe/stderr.golden → ...Execute/[general]_help_pipe/stderr.golden
diff --git a/...Execute/[general]_help_pipe/stdout.golden → ...Execute/[general]_help_pipe/stdout.golden b/...Execute/[general]_help_pipe/stdout.golden → ...Execute/[general]_help_pipe/stdout.golden
diff --git a/...ute/[general]_help_terminal/stderr.golden → ...ute/[general]_help_terminal/stderr.golden b/...ute/[general]_help_terminal/stderr.golden → ...ute/[general]_help_terminal/stderr.golden
diff --git a/...ute/[general]_help_terminal/stdout.golden → ...ute/[general]_help_terminal/stdout.golden b/...ute/[general]_help_terminal/stdout.golden → ...ute/[general]_help_terminal/stdout.golden
diff --git a/...xecute/[general]_no_content/stderr.golden → ...xecute/[general]_no_content/stderr.golden b/...xecute/[general]_no_content/stderr.golden → ...xecute/[general]_no_content/stderr.golden
diff --git a/...xecute/[general]_no_content/stdout.golden → ...xecute/[general]_no_content/stdout.golden b/...xecute/[general]_no_content/stdout.golden → ...xecute/[general]_no_content/stdout.golden
diff --git a/...cute/[general]_version_pipe/stderr.golden → ...cute/[general]_version_pipe/stderr.golden b/...cute/[general]_version_pipe/stderr.golden → ...cute/[general]_version_pipe/stderr.golden
diff --git a/...cute/[general]_version_pipe/stdout.golden → ...cute/[general]_version_pipe/stdout.golden b/...cute/[general]_version_pipe/stdout.golden → ...cute/[general]_version_pipe/stdout.golden
diff --git a/.../[general]_version_terminal/stderr.golden → .../[general]_version_terminal/stderr.golden b/.../[general]_version_terminal/stderr.golden → .../[general]_version_terminal/stderr.golden
diff --git a/.../[general]_version_terminal/stdout.golden → .../[general]_version_terminal/stdout.golden b/.../[general]_version_terminal/stdout.golden → .../[general]_version_terminal/stdout.golden
diff --git a/...lude-selector]_empty_string/stderr.golden → ...lude-selector]_empty_string/stderr.golden b/...lude-selector]_empty_string/stderr.golden → ...lude-selector]_empty_string/stderr.golden
diff --git a/...lude-selector]_empty_string/stdout.golden → ...lude-selector]_empty_string/stdout.golden b/...lude-selector]_empty_string/stdout.golden → ...lude-selector]_empty_string/stdout.golden
diff --git a/.../[include-selector]_invalid/stderr.golden → .../[include-selector]_invalid/stderr.golden b/.../[include-selector]_invalid/stderr.golden → .../[include-selector]_invalid/stderr.golden
diff --git a/.../[include-selector]_invalid/stdout.golden → .../[include-selector]_invalid/stdout.golden b/.../[include-selector]_invalid/stdout.golden → .../[include-selector]_invalid/stdout.golden
diff --git a/...-selector]_multiple_matches/stderr.golden → ...-selector]_multiple_matches/stderr.golden b/...-selector]_multiple_matches/stderr.golden → ...-selector]_multiple_matches/stderr.golden
diff --git a/...-selector]_multiple_matches/stdout.golden → ...-selector]_multiple_matches/stdout.golden b/...-selector]_multiple_matches/stdout.golden → ...-selector]_multiple_matches/stdout.golden
diff --git a/...include-selector]_one_match/stderr.golden → ...include-selector]_one_match/stderr.golden b/...include-selector]_one_match/stderr.golden → ...include-selector]_one_match/stderr.golden
diff --git a/...include-selector]_one_match/stdout.golden → ...include-selector]_one_match/stdout.golden b/...include-selector]_one_match/stdout.golden → ...include-selector]_one_match/stdout.golden
diff --git a/...lidation]_discouraged_value/stderr.golden → ...lidation]_discouraged_value/stderr.golden b/...lidation]_discouraged_value/stderr.golden → ...lidation]_discouraged_value/stderr.golden
diff --git a/...lidation]_discouraged_value/stdout.golden → ...lidation]_discouraged_value/stdout.golden b/...lidation]_discouraged_value/stdout.golden → ...lidation]_discouraged_value/stdout.golden
diff --git a/.../[validation]_invalid_value/stderr.golden → .../[validation]_invalid_value/stderr.golden b/.../[validation]_invalid_value/stderr.golden → .../[validation]_invalid_value/stderr.golden
diff --git a/.../[validation]_invalid_value/stdout.golden → .../[validation]_invalid_value/stdout.golden b/.../[validation]_invalid_value/stdout.golden → .../[validation]_invalid_value/stdout.golden
diff --git a/...ecute/[validation]_no_value/stderr.golden → ...ecute/[validation]_no_value/stderr.golden b/...ecute/[validation]_no_value/stderr.golden → ...ecute/[validation]_no_value/stderr.golden
diff --git a/...ecute/[validation]_no_value/stdout.golden → ...ecute/[validation]_no_value/stdout.golden b/...ecute/[validation]_no_value/stdout.golden → ...ecute/[validation]_no_value/stdout.golden
diff --git a/cli/cmd/util_pipe.go → cli/html2markdown/cmd/util_pipe.go b/cli/cmd/util_pipe.go → cli/html2markdown/cmd/util_pipe.go
diff --git a/cli/main.go → cli/html2markdown/main.go b/cli/main.go → cli/html2markdown/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/JohannesKaufmann/html-to-markdown/v2/cli/cmd"
+	"github.com/JohannesKaufmann/html-to-markdown/v2/cli/html2markdown/cmd"
 )
 
 var (
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ package main @@
     import (
     	"os"
-    	"github.com/JohannesKaufmann/html-to-markdown/v2/cli/cmd"
+    	"github.com/JohannesKaufmann/html-to-markdown/v2/cli/html2markdown/cmd"
     )
     var (
@@ Expand Down @@