Skip to content

Commit 3823a82

Browse files
committed
Fix makefile
1 parent 1420bb8 commit 3823a82

File tree

3 files changed

+142
-144
lines changed

3 files changed

+142
-144
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ deploy:
2525
provider: releases
2626
api_key:
2727
secure: uGmqaIW24BTFhnIF5vNdMR/MGCVoiSifIDIC4br/m/wfobAqdPO6+L5/QZSBaKRZu2Fd8weTTlEf1t8aCnzs5euDSweHA/wA6U7bX8W6kpg4yw78ZgHF/nvRr0fRxik92+/axgRbADugdpf9GdK0sGlE9wxeeNntJJ3tosc+ufg6RciCqBFTUJTxqAw+bQTi6DkaMAWgFKpff1Aivrju+MIrvUADyajQB6Pmf8uF0rXIRVkE3mg9PgAC5fsreO3lHORT/0Zw+a5W304LpilLCa9I/x/Lj93zOFRng87bnhOIqaVpnpiBcM9Z8ZXuguxbKLnM5w3WoMUKAcfIpV4DOCYgq3yAI4wTa7RGmLoEEgIKLi/DwT7fEzWJ4CmMktiuHKppwjFbYqOtHTFMZcpphqv8GXVCA5i3Cd1g0VIDd/sKQv0Iq8lwWYkI103fIMsqVVhyfaVvjtFyJLbeBGB4Ol3Q81cKo4hfG56eC21rK73jYw8HjPgjMu5fmlqrRYiWToRaogmcX5B+bY5rQTiRP/PSJXHgG50VAUloOePFZdLw7wep1S1dFOXa8oOg/ZFsvCDkqaoFM6ly8Y+tywk4Nu/enCCFdGjgLIqueU18UwmDe6PjAnLTtrFKpASUQvnzFydYRibM/67EQ0tIcmIlgcU+LfBefeuPtkDr6mEbS+w=
28-
file: '$TRAVIS_BUILD_DIR/dist/translate-formatter.alfredworkflow'
28+
file: '$TRAVIS_BUILD_DIR/dist/google-translate-formatter.alfredworkflow'
2929
skip_cleanup: true
3030
on:
3131
tags: true

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SHELL := /bin/bash
22

3-
NAME := go-alfred-sentence-splitter
4-
PACKAGE := sentence-splitter.alfredworkflow
3+
NAME := google-translate-formatter
4+
PACKAGE := $(NAME).alfredworkflow
55
PLIST := resources/info.plist
66
SRCS := $(shell go list -f {{.Dir}} ./... | grep -v /vendor/)
77
VERSION := $(shell git describe --tag --abbrev=0 || echo "v0.0.0")
@@ -16,7 +16,7 @@ build: test $(BUILT_TARGET) ;
1616

1717
$(BUILT_TARGET): $(SRCS)
1818
@echo "Build $(NAME) $(VERSION)"
19-
GO111MODULE=on go build $(LDFLAGS) -o google-translate-formatter .
19+
GO111MODULE=on go build $(LDFLAGS) -o $(NAME) .
2020

2121
clean:
2222
rm -f $(BUILT_TARGET)
@@ -36,17 +36,17 @@ deps:
3636
go mod download
3737

3838
release: test
39-
@if [[ ! "$(VER)" =~ ^v([0-9]\.){2}[0-9]$$ ]]; then \
40-
echo "'$(VER)' is invalid. Please call this like 'make release VER=v0.0.0'"; \
39+
@if [[ ! "$(VER)" =~ ^([0-9]\.){2}[0-9]$$ ]]; then \
40+
echo "'$(VER)' is invalid. Please call this like 'make release VER=0.0.0'"; \
4141
exit 1; \
4242
fi
43-
sed -i '' -e "/.*>version<.*/{n;s/v[0-9]\.[0-9]\.[0-9]/$(VER)/;}" $(PLIST)
43+
sed -i '' -e "/.*>version<.*/{n;s/v?[0-9]\.[0-9]\.[0-9]/$(VER)/;}" $(PLIST)
4444
git add $(PLIST)
45-
git commit -m 'Release $(VER)'
46-
git tag $(VER)
45+
git commit -m 'Release v$(VER)'
46+
git tag v$(VER)
4747
# Push this release to remote, please type following command
4848
# $ git push origin $(VER)
49-
@echo "$(VER) [OK]"
49+
@echo "v$(VER) [OK]"
5050

5151
$(PACKAGE): $(BUILT_TARGET)
5252
@if [ ! -d ./dist ]; then \

0 commit comments

Comments
 (0)