fixing merge conflicts

Author: allmightyspiff

README.md

@@ -326,6 +326,15 @@ anything with `T("some string here")` uses the internationalization system. Defi
 The string passed into the `T()` function serves as the ID when looking these up. So the ID Will need to be present in all i18n files, it will also need a translation string. 
 
 [i18n4go](https://github.com/maximilien/i18n4go) is used to make sure all strings being transalted have translations. To test run this command.
+
+For i18n4go, we specifically use v0.2.4 for now, so we have a prebuilt binary in `./bin/i18n4go`. If that binary needs to be rebuilt, use the SoftLayer fork at https://github.com/softlayer/i18n4go (which is set to the version we need, along with some updates since that version had a bug with --help).
+
+This command will build the Mac (arm64) version. Replace GOOS and GOARCH with the OS/Architecture you need to build for.
+```
+~/go/src/github.ibm.com/softlayer/softlayer-cli/i18n4go (master)
+$> GOOS=darwin GOARCH=arm64 go build -o i18n4go_mac -ldflags "-s -w" i18n4go/i18n4go.go
+```
+
 [go-i18n](https://github.com/nicksnyder/go-i18n/) is what is actually doing the translations, but its using an old v1 version.
 [go-bindata](https://github.com/jteeuwen/go-bindata) takes the json files, and turns them into a go binary.
 
@@ -470,4 +479,19 @@ It("return error", func() {
     Expect(err).To(HaveOccurred())
     Expect(err.Error()).To(ContainSubstring("Failed to show hardware."))
 })
-```
+```
+
+
+# Plugin Support / Release Process
+After v1.4.1 `sl` will be a normal plugin, so where are the instructions to build the plugin. 
+
+0. Create a new version and tag it in github like normal.
+1. Build the binaries. 
+```bash
+./bin/build-all
+for i in `ls --indicator-style=none out`; do echo "Uploading $i";  ibmcloud.exe cos upload --bucket softlayer-cli-binaries --file ./out/$i --key $i; done;
+```  
+2. Run the Jenkins job https://wcp-cloud-foundry-jenkins.swg-devops.com/job/Publish%20Plugin%20to%20YS1/
+
+## TODO
+Automate build with https://github.ibm.com/coligo/cli/tree/main/script

bin/build-all

@@ -9,9 +9,9 @@ build() {
     local os=$1
     local arch=$2
 
-    GOOS=$os GOARCH=$arch $ROOT_DIR/bin/build
+    GOOS=$os GOARCH=$arch go build -ldflags "-s -w" -o $ROOT_DIR/out/sl .
 
-    for f in ibmcloud; do
+    for f in sl; do
         nf="$f-$os-$arch"
         if [ "$os" == "windows" ]; then
             nf="$nf.exe"
@@ -21,17 +21,30 @@ build() {
     done
 }
 
+echo "Generating i18n resource file ..."
+if [[ "$OSTYPE" == "msys"* ]]; then
+    # For SO windows
+    ./bin/go-bindata.exe -pkg resources -o plugin/resources/i18n_resources.go plugin/i18n/resources
+else
+    ./bin/go-bindata -pkg resources -o plugin/resources/i18n_resources.go plugin/i18n/resources
+fi
+echo "Done."
+
+
+echo "Building Binaries ..."
 # disable CGO for Linux
 CGO_ENABLED=0 build linux amd64
 CGO_ENABLED=0 build linux 386
 CGO_ENABLED=0 build linux arm64
 
 build darwin amd64
+build darwin arm64
 
 build linux ppc64le
 build linux s390x
 
 build windows amd64
 build windows 386
 
-shasum $ROOT_DIR/out/ibmcloud-*
+echo "Generating binary hases ..."
+shasum $ROOT_DIR/out/sl-*