patching sh for ops

Author: michele-sciabarra

.gitignore

@@ -19,26 +19,25 @@
 .git-hooks/
 .vscode/
 .task/
-attic/
-_*
-ops
-!ops/
 .latestcheck
 .test_fail_then_succeed
-cookie.txt
-actions.zip
-nix/result
 .direnv/
+cookie.txt
+attic/
+*.zip
+_*
+7*
+!cmd/ops/
+ops
 tests/bats/
 tests/test_helper/bats-assert/
 tests/test_helper/bats-support/
+tests/prereq/olaris/bin
+tests/coreutils*
+tests/7z*
+!_patch
 _patch/task
 _patch/gosh
 _patch/wsk
 _patch/openwhisk-wskdeploy
 _patch/openwhisk-cli
-tests/prereq/olaris/bin
-dist/
-tests/coreutils*
-tests/7z*
-7*

.gitmodules

@@ -0,0 +1,28 @@
+[submodule "sh"]
+	path = _patches/sh
+	url = https://github.com/sciabarracom/sh
+	branch = openserverless
+[submodule "task"]
+	path = _patches/task
+	url = https://github.com/sciabarracom/task
+	branch = openserverless
+[submodule "wskdeploy"]
+	path = _patches/wskdeploy
+	url = https://github.com/sciabarracom/openwhisk-wskdeploy
+	branch = openserverless
+[submodule "wsk"]
+	path = _patches/wsk
+	url = https://github.com/sciabarracom/openwhisk-cli
+	branch = openserverless
+[submodule "modules/jq"]
+	path = _patches/jq
+	url = https://github.com/nuvolaris/gojq
+	branch = openserverless
+[submodule "modules/awk"]
+	path = _patches/awk
+	url = https://github.com/nuvolaris/goawk
+	branch = openserverless
+[submodule "modules/envsubst"]
+	path = _patches/envsubst
+	url = https://github.com/nuvolaris/envsubst
+	branch = openserverless

.goreleaser.yaml

@@ -29,6 +29,9 @@ builds:
     goarch:
       - amd64
       - arm64
+    ignore:
+      - goos: windows
+        goarch: arm64
 
 archives:
   - id: default

Taskfile.yml

@@ -90,7 +90,7 @@ tasks:
     desc: unit test (use F=-v to verbose)
     cmds:
       - rm -Rf ~/.ops
-      - go clean -testcache
+      - go clean -testcache -cache
       - go test -count=1 {{.F}} github.com/apache/openserverless-cli
       - go test -count=1 {{.F}} github.com/apache/openserverless-cli/config
       - go test -count=1 {{.F}} github.com/apache/openserverless-cli/tools  

_patches/README.md

@@ -1,4 +1,4 @@
-# Patches:
+# Patches to the tools
 
 - changes to mvdan/sh:
    - rename to sciabarracom/sh

_patches/awk

@@ -54,7 +54,7 @@ func isBuiltin(name string) bool {
 	if isTools(name) {
 		return true
 	}
-	return IsBuiltin1(name)
+	return isBuiltin_orig(name)
 }
 
 func (r *Runner) builtinCode(ctx context.Context, pos syntax.Pos, name string, args []string) int {
@@ -65,19 +65,20 @@ func (r *Runner) builtinCode(ctx context.Context, pos syntax.Pos, name string, a
 			cmd = append(cmd, name)
 		}
 		args = append(cmd, args...)
-		fmt.Printf("%v\n", args)
-		r.exitShell(ctx, 1)
+		if os.Getenv("TRACE") != "" {
+			fmt.Printf("%v\n", args)
+		}
 		r.exec(ctx, args)
 		return r.exit
 	}
 
 	if isTools(name) {
 		args = append([]string{os.Getenv("OPS_CMD"), "-" + name}, args...)
-		fmt.Printf("%v\n", args)
-		r.exitShell(ctx, 1)
+		if os.Getenv("TRACE") != "" {
+			fmt.Printf("%v\n", args)
+		}
 		r.exec(ctx, args)
 		return r.exit
-
 	}
-	return r.BuiltinCode1(ctx, pos, name, args)
+	return r.builtinCode_orig(ctx, pos, name, args)
 }

_patches/builtin_extra.go

@@ -21,21 +21,29 @@ cd "$(dirname $0)"
 go clean -cache -modcache -testcache
 HERE=$PWD
 STAG="v3.8.0"
-DTAG="v3.8.2"
+DTAG="v3.8.3"
 cd sh
+git reset --hard
 git checkout "$STAG" -B openserverless
 cp $HERE/builtin_extra.go interp/builtin_extra.go
 git add interp/builtin_extra.go
-sed  -i -e 's!) builtinCode(!) BuiltinCode1(!' -e 's!func isBuiltin!func IsBuiltin1!' interp/builtin.go
+sed  -i -e 's!) builtinCode(!) builtinCode_orig(!' -e 's!func isBuiltin!func isBuiltin_orig!' interp/builtin.go
 find . \( -name \*.go -o -name go.mod \) | while read file 
 do echo $file 
    sed -i 's!mvdan.cc/sh!github.com/sciabarracom/sh!' $file 
 done
 go clean -modcache -cache -testcache -fuzzcache
 go mod tidy
+
+#echo >>go.mod "replace github.com/sciabarracom/sh/v3/interp => ./interp" 
+#echo >>go.mod "replace github.com/sciabarracom/sh/v3/syntax => ./syntax"
+#go build ./cmd/gosh
+#
+#exit
+
 git commit -m "patching sh for ops" -a
 git tag $DTAG
 git push -f origin-auth openserverless --tags
 VER=$(git rev-parse --short HEAD)
 GOBIN=$HERE go install github.com/sciabarracom/sh/v3/cmd/gosh@$VER
-
+OPS_CMD=$(which ops) OPS_TOOLS="jq awk" OPS_COREUTILS="ls cp mv" TRACE=1 ./gosh