Commit
+5 -72 +/-3 browse
1 | diff --git a/Dockerfile b/Dockerfile |
2 | deleted file mode 100644 |
3 | index 1137f14..0000000 |
4 | --- a/Dockerfile |
5 | +++ /dev/null |
6 | @@ -1,24 +0,0 @@ |
7 | - # Dockerfile for cross-platform Pomo builds |
8 | - FROM golang:1.12-stretch |
9 | - |
10 | - ENV OSXCROSS_REPO="https://github.com/tpoechtrager/osxcross.git" |
11 | - ENV OSX_SDK_TARBALL="https://s3.dockerproject.org/darwin/v2/MacOSX10.11.sdk.tar.xz" |
12 | - |
13 | - RUN \ |
14 | - apt-get update -yyq \ |
15 | - && apt-get install -yyq \ |
16 | - clang \ |
17 | - libxml2 \ |
18 | - patch \ |
19 | - xz-utils |
20 | - |
21 | - RUN \ |
22 | - mkdir /build \ |
23 | - && cd /build \ |
24 | - && git clone --depth=1 "$OSXCROSS_REPO" \ |
25 | - && cd osxcross/tarballs \ |
26 | - && wget "$OSX_SDK_TARBALL" \ |
27 | - && cd .. \ |
28 | - && UNATTENDED=1 ./build.sh |
29 | - |
30 | - ENV PATH="$PATH:/build/osxcross/target/bin" |
31 | diff --git a/Makefile b/Makefile |
32 | index eb7a2e5..66c420b 100644 |
33 | --- a/Makefile |
34 | +++ b/Makefile |
35 | @@ -13,10 +13,7 @@ LDFLAGS=\ |
36 | test \ |
37 | docs \ |
38 | pomo-build \ |
39 | - readme \ |
40 | - release \ |
41 | - release-linux \ |
42 | - release-darwin |
43 | + readme |
44 | |
45 | default: |
46 | cd cmd/pomo && \ |
47 | @@ -33,36 +30,8 @@ test: |
48 | go test ./... |
49 | go vet ./... |
50 | |
51 | - pomo-build: |
52 | - docker build -t $(DOCKER_IMAGE) . |
53 | - |
54 | - bin/pomo-linux: bin/pomo-$(VERSION)-linux-amd64 |
55 | - |
56 | - bin/pomo-darwin: bin/pomo-$(VERSION)-darwin-amd64 |
57 | - |
58 | - bin/pomo-$(VERSION)-linux-amd64: bin |
59 | - $(DOCKER_CMD) --env GOOS=linux --env GOARCH=amd64 $(DOCKER_IMAGE) go build -ldflags "${LDFLAGS}" -o $@ |
60 | - |
61 | - bin/pomo-$(VERSION)-linux-amd64.md5: |
62 | - md5sum bin/pomo-$(VERSION)-linux-amd64 | sed -e 's/bin\///' > $@ |
63 | - |
64 | - bin/pomo-$(VERSION)-darwin-amd64: bin |
65 | - # This is used to cross-compile a Darwin compatible Mach-O executable |
66 | - # on Linux for OSX, you need to install https://github.com/tpoechtrager/osxcross |
67 | - $(DOCKER_CMD) --env GOOS=darwin --env GOARCH=amd64 --env CC=x86_64-apple-darwin15-cc --env CGO_ENABLED=1 $(DOCKER_IMAGE) go build -ldflags "${LDFLAGS}" -o $@ |
68 | - |
69 | - |
70 | - bin/pomo-$(VERSION)-darwin-amd64.md5: |
71 | - md5sum bin/pomo-$(VERSION)-darwin-amd64 | sed -e 's/bin\///' > $@ |
72 | - |
73 | - release-linux: bin/pomo-$(VERSION)-linux-amd64 bin/pomo-$(VERSION)-linux-amd64.md5 |
74 | - |
75 | - release-darwin: bin/pomo-$(VERSION)-darwin-amd64 bin/pomo-$(VERSION)-darwin-amd64.md5 |
76 | - |
77 | - release: release-linux release-darwin |
78 | - |
79 | docs: www/data/readme.json |
80 | - cd www && cp ../install.sh static/ && hugo -d ../docs |
81 | + cd www && hugo -d ../docs |
82 | |
83 | www/data/readme.json: www/data README.md |
84 | cat README.md | python -c 'import json,sys; print(json.dumps({"content": sys.stdin.read()}))' > $@ |
85 | diff --git a/README.md b/README.md |
86 | index b5b7453..dac20d9 100644 |
87 | --- a/README.md |
88 | +++ b/README.md |
89 | @@ -18,24 +18,12 @@ The Pomodoro Technique is simple and effective: |
90 | |
91 | ## Installation |
92 | |
93 | - ### Binaries |
94 | - |
95 | - Binaries are available for Linux and OSX platforms in the [releases section](https://github.com/kevinschoon/pomo/releases) on github. |
96 | - |
97 | - ### Installer Script |
98 | - |
99 | - A bash script to download and verify the latest release for Linux and OSX platforms can be run |
100 | - with the following command: |
101 | - |
102 | - ```bash |
103 | - curl -L -s https://kevinschoon.github.io/pomo/install.sh | bash /dev/stdin |
104 | - ``` |
105 | - |
106 | ### Source |
107 | |
108 | ```bash |
109 | - go get github.com/kevinschoon/pomo |
110 | - pomo -v |
111 | + git clone git@github.com:kevinschoon/pomo.git |
112 | + cd pomo |
113 | + make |
114 | ``` |
115 | |
116 | ## Usage |