Skip to content
This repository was archived by the owner on Jan 25, 2022. It is now read-only.

Commit 27d4bf5

Browse files
committed
20200628 change requests
1 parent 5f238d5 commit 27d4bf5

36 files changed

+1200
-1312
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ bin/
44
buildtools/*/*
55
tests/src
66
tests/target
7+
nosync

.idea/workspace.xml

+91-61
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

+53-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
################################################################################
2+
SHELL=/bin/bash
23
ifeq (, $(shell which buildtool))
34
$(warning "Installing buildtool...")
45
$(warning "go get github.com/gearboxworks/buildtool")
@@ -10,10 +11,18 @@ $(error "No buildtool found...")
1011
endif
1112
################################################################################
1213

14+
args = `arg="$(filter-out $@,$(MAKECMDGOALS))" && echo $${arg:-${1}}`
15+
1316
all:
14-
@echo "build - Build for local testing."
15-
@echo "release - Build for published release."
16-
@echo "push - Push repo to GitHub."
17+
@:
18+
19+
%:
20+
@:
21+
22+
################################################################################
23+
24+
help:
25+
@$(BUILDTOOL) $@ $(args)
1726
@echo ""
1827
@echo "build-docker - Build Docker cotainer."
1928
@echo "test-run - Run a test using native GoLang."
@@ -23,20 +32,52 @@ all:
2332
@$(BUILDTOOL) get all
2433

2534
build:
26-
@make pkgreflect
27-
@$(BUILDTOOL) build
35+
@$(BUILDTOOL) $@ $(args)
2836

29-
release:
30-
@make pkgreflect
31-
@$(BUILDTOOL) release
37+
clone:
38+
@$(BUILDTOOL) $@ $(args)
3239

33-
push:
34-
@make pkgreflect
35-
@$(BUILDTOOL) push
40+
commit:
41+
@$(BUILDTOOL) $@ $(args)
42+
43+
get:
44+
@$(BUILDTOOL) $@ $(args)
45+
46+
ghr:
47+
@$(BUILDTOOL) $@ $(args)
48+
49+
go:
50+
@$(BUILDTOOL) $@ $(args)
3651

3752
pkgreflect:
38-
@$(BUILDTOOL) pkgreflect jtc/helpers
53+
@$(BUILDTOOL) $@ $(args)
54+
55+
pull:
56+
@$(BUILDTOOL) $@ $(args)
3957

58+
push:
59+
@$(BUILDTOOL) $@ $(args)
60+
61+
release:
62+
@$(BUILDTOOL) $@ $(args)
63+
64+
selfupdate:
65+
@$(BUILDTOOL) $@ $(args)
66+
67+
set:
68+
@$(BUILDTOOL) $@ $(args)
69+
70+
sync:
71+
@$(BUILDTOOL) $@ $(args)
72+
73+
version:
74+
@$(BUILDTOOL) $@ $(args)
75+
76+
vfsgen:
77+
@$(BUILDTOOL) $@ $(args)
78+
79+
80+
################################################################################
4081
build-docker:
4182
@make -C docker
4283

cmd/commands.go

+1-34
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ import (
66
"github.com/wplib/deploywp/defaults"
77
)
88

9+
910
const onlyOnce = "1"
1011
var onlyTwice = []string{"", ""}
1112

1213

1314
func init() {
1415
rootCmd.AddCommand(buildCmd)
15-
//rootCmd.AddCommand(toolsCmd)
16-
//rootCmd.AddCommand(loadCmd)
17-
//rootCmd.AddCommand(runCmd)
1816
}
1917

2018

@@ -53,34 +51,3 @@ func cmdBuild(cmd *cobra.Command, args []string) {
5351

5452
CmdScribe.State = state
5553
}
56-
57-
58-
//var toolsCmd = &cobra.Command{
59-
// Use: loadTools.CmdTools,
60-
// Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Show all built-in template helpers."),
61-
// Long: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Show all built-in template helpers."),
62-
// Run: cmdTools,
63-
//}
64-
//
65-
//var convertCmd = &cobra.Command{
66-
// Use: loadTools.CmdConvert,
67-
// Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Convert a template file to the resulting output file."),
68-
// Long: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Convert a template file to the resulting output file."),
69-
// Run: cmdConvert,
70-
//}
71-
//var loadCmd = &cobra.Command{
72-
// Use: loadTools.CmdLoad,
73-
// Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Load and execute a template file."),
74-
// Long: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Load and execute a template file."),
75-
// Run: cmdLoad,
76-
// DisableFlagParsing: false,
77-
//}
78-
//var runCmd = &cobra.Command{
79-
// Use: loadTools.CmdRun,
80-
// Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Execute resulting output file as a BASH script."),
81-
// Long: ux.SprintfMagenta("scribe") + ux.SprintfBlue(`Execute resulting output file as a BASH script.
82-
//You can also use this command as the start to '#!' scripts.
83-
//For example: #!/usr/bin/env scribe --json gearbox.json run
84-
//`),
85-
// Run: cmdRun,
86-
//}

cmd/funcs.go

-166
This file was deleted.

0 commit comments

Comments
 (0)