diff --git a/.gitattributes b/.gitattributes index dea9075..23a7bd2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,4 @@ .editorconfig export-ignore .gitattributes export-ignore .gitignore export-ignore -*.gif export-ignore -*.png export-ignore +assets/ export-ignore diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index b21e611..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: goreleaser - -on: - push: - tags: [ '*' ] - -jobs: - goreleaser: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set up Go - uses: actions/setup-go@v2 - with: - go-version: 1.16 - - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v2 - with: - distribution: goreleaser - version: latest - args: release --rm-dist - extra_files: install.sh - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Makefile b/Makefile index 8619f34..cf07d47 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,24 @@ -BINDIR = /usr/local/bin - -.PHONY: build -build: - GOOS= GOARCH= GOARM= GOFLAGS= go build -o ${BINDIR}/_awsd_prompt +BINDIR = /usr/local/bin +help: ## Show this help + @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' -.PHONY: install -install: build +install: ## Install Target + GOOS= GOARCH= GOARM= GOFLAGS= go build -o ${BINDIR}/_awsd_prompt chmod 755 ${BINDIR}/_awsd_prompt cp scripts/_awsd ${BINDIR}/_awsd - @echo 'alias awsd="source _awsd"' >> ${HOME}/.zshrc - @echo 'alias awsd="source _awsd"' >> ${HOME}/.bashrc - @echo 'alias awsd="source _awsd"' >> ${HOME}/.bash_profile + @echo " -=-=--=-=-=-=-=-=-=-=-=-=-=-=- " + @echo " " + @echo " To Finish Installation add " + @echo " " + @echo " alias awsd=\"source _awsd\" " + @echo " " + @echo " to your bash profile or zshrc " + @echo " then open new terminal or " + @echo " source that file " + @echo " " + @echo " -=-=--=-=-=-=-=-=-=-=-=-=-=-=- " -.PHONY: uninstall -uninstall: +uninstall: ## Uninstall Target rm -f ${BINDIR}/_awsd rm -f ${BINDIR}/_awsd_prompt diff --git a/README.md b/README.md index f54d39c..be0606b 100644 --- a/README.md +++ b/README.md @@ -17,18 +17,24 @@ min go 1.16 brew tap pjauduiomv/awsd brew install awsd ``` -then add `alias awsd="source _awsd"` to your `~/.bash_profile` or `~/.zshrc`. Then source that file or open new terminal. - -### from source +### Makefile ```sh -run install.sh +make install ``` -open new terminal or source your `~/.bash_profile` or `~/.zshrc` config +### To Finish Installation +Add the following to your bash profile or zshrc then open new terminal or source that file + +```sh +alias awsd="source _awsd" +``` + +Ex. `echo 'alias awsd="source _awsd"' >> ~/.zshrc` + ## Usage ```sh awsd diff --git a/go.mod b/go.mod index f92eed2..d0370a3 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/pjaudiomv/_awsd_prompt +module github.com/pjaudiomv/awsd go 1.16 diff --git a/install.sh b/install.sh deleted file mode 100755 index 22902c1..0000000 --- a/install.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env bash - -PREFIX=${PREFIX:="/usr/local"} -mkdir -p "${PREFIX}/bin" -PREFIX="$(cd -P -- "${PREFIX}" && pwd)" -echo "Installing into ${PREFIX}/bin" | sed "s#$HOME#~#g" - -if ! command -v go version &> /dev/null -then - echo " -=-=--=-=-=-=-=-=-=-=-=-=-=-=- " - echo " " - echo " !!! " - echo " go not found " - echo " you can download here " - echo " https://golang.org/doc/install " - echo " " - echo " -=-=--=-=-=-=-=-=-=-=-=-=-=-=- " - exit -fi - -OS=$(go env GOOS) -ARCH=$(go env GOARCH) -RC="${SHELL##*/}rc" - -env GOOS="$OS" GOBIN="${PREFIX}"/bin/ GOARCH="$ARCH" go install - -touch "${PREFIX}"/bin/_awsd -chmod +x "${PREFIX}"/bin/_awsd - -cat > "${PREFIX}/bin/_awsd" <> "$HOME/.$RC" <