From ba30e9e450462e3445f7534f3167d54e198b6a7b Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 8 Aug 2018 07:39:58 +1000 Subject: [PATCH 1/7] log some travis ci stuff --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d921d365d..c55390b48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ before_install: # Download the binary to bin folder in $GOPATH # - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-386 -o $GOPATH/bin/dep - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh + - ls + - ls */* # Make the binary executable - chmod +x $GOPATH/bin/dep - ls $GOPATH/bin/ @@ -26,15 +28,16 @@ script: # - diff -u <(echo -n) <(gofmt -d .) # can't make gofmt ignore vendor directory # - go vet $(go list ./... | grep -v /vendor/) - if [ "${LATEST}" = "true" ]; then gox -os="linux darwin windows" -arch="amd64" -output="lazygit.." -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./...; fi + - ls */* deploy: provider: releases skip_cleanup: true api_key: secure: TnB8I+swjicHuGTXk3ncm1Aaa12eIJqWV/Lhcnbb01i39p6+fyn3vDMdWPcejt3R8gcJqv4wyP8UQVO9G1qkLppt6V/qAuY5x6nX0MgEa3t+8JLJnGYHZYsuIgan/ecAmeu5+6dgUhr9Oq6zQOEv/O88NsALzMlqnEQNXI8XSoScfhkiVDIp3zWov0vBizCdThnNgTx9zRpJVoqxmhWvgt+me2+fOhSx1Y+3ZA2gE7zq8IFAbxp36d0rsR5lKqmTuF+YsF9iQ7Ar+xCjbRunLsZx+VwGqGfpS/qS7EwsEqBI0vEO76eFJkwEsIzOvJiFNhBDUu3upquBFMT4uzxRxH3eV+J4mZtu29UDLdvKI5Q730Lk9AgmH4now+RmP08M0SEXJa+AnHeuBv2u1iU5bu+sI6CORVQzKQwOph9AABDjSZ54wrXIpYEeIW2sz8nx+hiG6QL1mqfM/l+55BR69u3vxKYMryQBxPuzhZCTOqqI4uahlb6GIUNZJ9vGZeIA9HFJq3ymW8cdrpYzhKf3Nx9jK+Yb81h5/AHq9iChXEC63VPCDXXGRllh2UYWNYCaAdtk+ekpLR8299e4CaEregy6g5U2S3/xrBKl87miu1uJ/fquXoxGdSU+JcmsmXZ26sGIU2TCYdNjSfIgpOyfMmB4JNtKHqWRHA9Fe42CRpA= file: - - $GOPATH/bin/lazygit.windows.amd64.exe - - $GOPATH/bin/lazygit.darwin.amd64 - - $GOPATH/bin/lazygit.linux.amd64 + - lazygit.windows.amd64.exe + - lazygit.darwin.amd64 + - lazygit.linux.amd64 on: repo: jesseduffield/lazygit tags: true From 411c02324fcbb8185216202ec972ac1eb4e37e32 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 8 Aug 2018 07:54:11 +1000 Subject: [PATCH 2/7] use gox default output --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c55390b48..d4f76e1c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,8 @@ script: # - go get -v ./... # - diff -u <(echo -n) <(gofmt -d .) # can't make gofmt ignore vendor directory # - go vet $(go list ./... | grep -v /vendor/) - - if [ "${LATEST}" = "true" ]; then gox -os="linux darwin windows" -arch="amd64" -output="lazygit.." -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./...; fi + - if [ "${LATEST}" = "true" ]; then gox -os="linux darwin windows" -arch="amd64" -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./...; fi + - ls - ls */* deploy: provider: releases From 2a25ce014b6ca4132b2af58434368266edd5e8a5 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 8 Aug 2018 07:56:55 +1000 Subject: [PATCH 3/7] use correct filenames --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d4f76e1c6..fc6620603 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,9 +36,9 @@ deploy: api_key: secure: TnB8I+swjicHuGTXk3ncm1Aaa12eIJqWV/Lhcnbb01i39p6+fyn3vDMdWPcejt3R8gcJqv4wyP8UQVO9G1qkLppt6V/qAuY5x6nX0MgEa3t+8JLJnGYHZYsuIgan/ecAmeu5+6dgUhr9Oq6zQOEv/O88NsALzMlqnEQNXI8XSoScfhkiVDIp3zWov0vBizCdThnNgTx9zRpJVoqxmhWvgt+me2+fOhSx1Y+3ZA2gE7zq8IFAbxp36d0rsR5lKqmTuF+YsF9iQ7Ar+xCjbRunLsZx+VwGqGfpS/qS7EwsEqBI0vEO76eFJkwEsIzOvJiFNhBDUu3upquBFMT4uzxRxH3eV+J4mZtu29UDLdvKI5Q730Lk9AgmH4now+RmP08M0SEXJa+AnHeuBv2u1iU5bu+sI6CORVQzKQwOph9AABDjSZ54wrXIpYEeIW2sz8nx+hiG6QL1mqfM/l+55BR69u3vxKYMryQBxPuzhZCTOqqI4uahlb6GIUNZJ9vGZeIA9HFJq3ymW8cdrpYzhKf3Nx9jK+Yb81h5/AHq9iChXEC63VPCDXXGRllh2UYWNYCaAdtk+ekpLR8299e4CaEregy6g5U2S3/xrBKl87miu1uJ/fquXoxGdSU+JcmsmXZ26sGIU2TCYdNjSfIgpOyfMmB4JNtKHqWRHA9Fe42CRpA= file: - - lazygit.windows.amd64.exe - - lazygit.darwin.amd64 - - lazygit.linux.amd64 + - lazygit_windows_amd64.exe + - lazygit_darwin_amd64 + - lazygit_linux_amd64 on: repo: jesseduffield/lazygit tags: true From 8cc444182fe70d2e1425cc50c7dc5e67cbbd335a Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 8 Aug 2018 08:02:33 +1000 Subject: [PATCH 4/7] make binaries executable --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fc6620603..90468ea42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,10 @@ script: # - go get -v ./... # - diff -u <(echo -n) <(gofmt -d .) # can't make gofmt ignore vendor directory # - go vet $(go list ./... | grep -v /vendor/) - - if [ "${LATEST}" = "true" ]; then gox -os="linux darwin windows" -arch="amd64" -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./...; fi + - gox -os="linux darwin windows" -arch="amd64" -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./... + - chmod +x ./lazygit_windows_amd64.exe + - chmod +x ./lazygit_darwin_amd64 + - chmod +x ./lazygit_linux_amd64 - ls - ls */* deploy: From 2853aba951b18034b62a3430888199a1319523ca Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 8 Aug 2018 08:07:43 +1000 Subject: [PATCH 5/7] appending version number to binaries --- .travis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90468ea42..baca9494c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,12 @@ script: # - diff -u <(echo -n) <(gofmt -d .) # can't make gofmt ignore vendor directory # - go vet $(go list ./... | grep -v /vendor/) - gox -os="linux darwin windows" -arch="amd64" -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./... - - chmod +x ./lazygit_windows_amd64.exe - - chmod +x ./lazygit_darwin_amd64 - - chmod +x ./lazygit_linux_amd64 + - mv lazygit_windows_amd64.exe lazygit_windows_amd64_${TRAVIS_TAG}.exe + - mv lazygit_darwin_amd64 lazygit_darwin_amd64_${TRAVIS_TAG} + - mv lazygit_linux_amd64 lazygit_linux_amd64_${TRAVIS_TAG} + - chmod +x ./lazygit_windows_amd64_${TRAVIS_TAG}.exe + - chmod +x ./lazygit_darwin_amd64_${TRAVIS_TAG} + - chmod +x ./lazygit_linux_amd64_${TRAVIS_TAG} - ls - ls */* deploy: @@ -39,9 +42,9 @@ deploy: api_key: secure: TnB8I+swjicHuGTXk3ncm1Aaa12eIJqWV/Lhcnbb01i39p6+fyn3vDMdWPcejt3R8gcJqv4wyP8UQVO9G1qkLppt6V/qAuY5x6nX0MgEa3t+8JLJnGYHZYsuIgan/ecAmeu5+6dgUhr9Oq6zQOEv/O88NsALzMlqnEQNXI8XSoScfhkiVDIp3zWov0vBizCdThnNgTx9zRpJVoqxmhWvgt+me2+fOhSx1Y+3ZA2gE7zq8IFAbxp36d0rsR5lKqmTuF+YsF9iQ7Ar+xCjbRunLsZx+VwGqGfpS/qS7EwsEqBI0vEO76eFJkwEsIzOvJiFNhBDUu3upquBFMT4uzxRxH3eV+J4mZtu29UDLdvKI5Q730Lk9AgmH4now+RmP08M0SEXJa+AnHeuBv2u1iU5bu+sI6CORVQzKQwOph9AABDjSZ54wrXIpYEeIW2sz8nx+hiG6QL1mqfM/l+55BR69u3vxKYMryQBxPuzhZCTOqqI4uahlb6GIUNZJ9vGZeIA9HFJq3ymW8cdrpYzhKf3Nx9jK+Yb81h5/AHq9iChXEC63VPCDXXGRllh2UYWNYCaAdtk+ekpLR8299e4CaEregy6g5U2S3/xrBKl87miu1uJ/fquXoxGdSU+JcmsmXZ26sGIU2TCYdNjSfIgpOyfMmB4JNtKHqWRHA9Fe42CRpA= file: - - lazygit_windows_amd64.exe - - lazygit_darwin_amd64 - - lazygit_linux_amd64 + - lazygit_windows_amd64_${TRAVIS_TAG}.exe + - lazygit_darwin_amd64_${TRAVIS_TAG} + - lazygit_linux_amd64_${TRAVIS_TAG} on: repo: jesseduffield/lazygit tags: true From 7add598235a48217a68ed41a1b6023ca21fa4239 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 8 Aug 2018 08:13:40 +1000 Subject: [PATCH 6/7] give everybody permission --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index baca9494c..a606e42f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,9 @@ script: - mv lazygit_windows_amd64.exe lazygit_windows_amd64_${TRAVIS_TAG}.exe - mv lazygit_darwin_amd64 lazygit_darwin_amd64_${TRAVIS_TAG} - mv lazygit_linux_amd64 lazygit_linux_amd64_${TRAVIS_TAG} - - chmod +x ./lazygit_windows_amd64_${TRAVIS_TAG}.exe - - chmod +x ./lazygit_darwin_amd64_${TRAVIS_TAG} - - chmod +x ./lazygit_linux_amd64_${TRAVIS_TAG} + - chmod a+x ./lazygit_windows_amd64_${TRAVIS_TAG}.exe + - chmod a+x ./lazygit_darwin_amd64_${TRAVIS_TAG} + - chmod a+x ./lazygit_linux_amd64_${TRAVIS_TAG} - ls - ls */* deploy: From 3b264806ef14dcdddaa429acc2bcc10cc37cd9cb Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 8 Aug 2018 08:32:52 +1000 Subject: [PATCH 7/7] add version number --- gui.go | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gui.go b/gui.go index 7c5344dd8..5ff2eeeb2 100644 --- a/gui.go +++ b/gui.go @@ -16,6 +16,9 @@ import ( "github.com/jesseduffield/gocui" ) +// Rev is the release version +var Rev string + // OverlappingEdges determines if panel edges overlap var OverlappingEdges = false @@ -225,14 +228,28 @@ func layout(g *gocui.Gui) error { v.FgColor = gocui.ColorWhite } - if v, err := g.SetView("options", -1, optionsTop, width, optionsTop+2, 0); err != nil { + version := Rev + if version == "" { + version = "unversioned" + } + + if v, err := g.SetView("options", -1, optionsTop, width-len(version)-2, optionsTop+2, 0); err != nil { if err != gocui.ErrUnknownView { return err } v.BgColor = gocui.ColorDefault v.FgColor = gocui.ColorBlue v.Frame = false - v.Title = "Options" + } + + if v, err := g.SetView("version", width-len(version)-1, optionsTop, width, optionsTop+2, 0); err != nil { + if err != gocui.ErrUnknownView { + return err + } + v.BgColor = gocui.ColorDefault + v.FgColor = gocui.ColorGreen + v.Frame = false + renderString(g, "version", version) // these are only called once handleFileSelect(g, filesView)