add proper remote url to SHA link in sidebar

This commit is contained in:
zoidy 2020-10-31 17:28:28 -07:00
parent b0ce9826a2
commit 32b0e81cbe
6 changed files with 18 additions and 11 deletions

View File

@ -11,7 +11,7 @@ build:
env: env:
- CGO_ENABLED=0 - CGO_ENABLED=0
ldflags: ldflags:
- -s -w -X github.com/filebrowser/filebrowser/v2/version.Version={{ .Version }} -X github.com/filebrowser/filebrowser/v2/version.CommitSHA={{ .ShortCommit }} - -s -w -X github.com/filebrowser/filebrowser/v2/version.Version={{ .Version }} -X github.com/filebrowser/filebrowser/v2/version.CommitSHA={{ .ShortCommit }} -X github.com/filebrowser/filebrowser/v2/version.GitURL={{ .GitURL }}
main: main.go main: main.go
binary: filebrowser binary: filebrowser
goos: goos:

View File

@ -47,13 +47,13 @@
<span v-if="disableExternal">File Browser</span> <span v-if="disableExternal">File Browser</span>
<a v-else rel="noopener noreferrer" target="_blank" href="https://github.com/filebrowser/filebrowser">File Browser</a> <a v-else rel="noopener noreferrer" target="_blank" href="https://github.com/filebrowser/filebrowser">File Browser</a>
<span> {{ version }}</span> <span> {{ version }}</span>
</span>
<span> <span>
Commit SHA: Commit SHA:
<a rel="noopener noreferrer" target="_blank" :href="'https://github.com/zoidy/filebrowser/commit/'+commitSHA"> <a rel="noopener noreferrer" target="_blank" :href="gitURL+'/commit/'+commitSHA">
<span style="width:3.7em;overflow:hidden;display:inline-block;white-space:nowrap;vertical-align:bottom;">{{ commitSHA }}</span> <span style="width:3.7em;overflow:hidden;display:inline-block;white-space:nowrap;vertical-align:bottom;">{{ commitSHA }}</span>
</a> </a>
</span> </span>
</span>
<span><a @click="help">{{ $t('sidebar.help') }}</a></span> <span><a @click="help">{{ $t('sidebar.help') }}</a></span>
</p> </p>
</nav> </nav>
@ -62,7 +62,7 @@
<script> <script>
import { mapState, mapGetters } from 'vuex' import { mapState, mapGetters } from 'vuex'
import * as auth from '@/utils/auth' import * as auth from '@/utils/auth'
import { version, signup, disableExternal, noAuth, authMethod, commitSHA } from '@/utils/constants' import { version, signup, disableExternal, noAuth, authMethod, commitSHA, gitURL } from '@/utils/constants'
export default { export default {
name: 'sidebar', name: 'sidebar',
@ -77,7 +77,8 @@ export default {
disableExternal: () => disableExternal, disableExternal: () => disableExternal,
noAuth: () => noAuth, noAuth: () => noAuth,
authMethod: () => authMethod, authMethod: () => authMethod,
commitSHA: () => commitSHA commitSHA: () => commitSHA,
gitURL: () => gitURL
}, },
methods: { methods: {
help () { help () {

View File

@ -15,6 +15,7 @@ const enableThumbs = window.FileBrowser.EnableThumbs
const resizePreview = window.FileBrowser.ResizePreview const resizePreview = window.FileBrowser.ResizePreview
const enableExec = window.FileBrowser.EnableExec const enableExec = window.FileBrowser.EnableExec
const commitSHA = window.FileBrowser.CommitSHA const commitSHA = window.FileBrowser.CommitSHA
const gitURL = window.FileBrowser.GitURL
export { export {
name, name,
@ -32,5 +33,6 @@ export {
enableThumbs, enableThumbs,
resizePreview, resizePreview,
enableExec, enableExec,
commitSHA commitSHA,
gitURL
} }

View File

@ -43,6 +43,7 @@ func handleWithStaticData(w http.ResponseWriter, _ *http.Request, d *data, box *
"ResizePreview": d.server.ResizePreview, "ResizePreview": d.server.ResizePreview,
"EnableExec": d.server.EnableExec, "EnableExec": d.server.EnableExec,
"CommitSHA": version.CommitSHA, "CommitSHA": version.CommitSHA,
"GitURL": version.GitURL,
} }
if d.settings.Branding.Files != "" { if d.settings.Branding.Files != "" {

View File

@ -5,4 +5,6 @@ var (
Version = "(untracked)" Version = "(untracked)"
// CommitSHA is the commmit sha. // CommitSHA is the commmit sha.
CommitSHA = "(unknown)" CommitSHA = "(unknown)"
//GitURL is the url of the remote
GitURL = "(unavailable)"
) )

View File

@ -5,6 +5,7 @@ set -e
untracked="(untracked)" untracked="(untracked)"
REPO=$(cd $(dirname $0); pwd) REPO=$(cd $(dirname $0); pwd)
COMMIT_SHA=$(git rev-parse --short HEAD) COMMIT_SHA=$(git rev-parse --short HEAD)
GIT_URL=$(git config --get remote.origin.url)
ASSETS="false" ASSETS="false"
BINARY="false" BINARY="false"
RELEASE="" RELEASE=""
@ -43,7 +44,7 @@ buildBinary () {
rice embed-go rice embed-go
cd $REPO cd $REPO
go build -a -o filebrowser -ldflags "-s -w -X github.com/filebrowser/filebrowser/v2/version.CommitSHA=$COMMIT_SHA" go build -a -o filebrowser -ldflags "-s -w -X github.com/filebrowser/filebrowser/v2/version.CommitSHA=$COMMIT_SHA -X github.com/filebrowser/filebrowser/v2/version.GitURL=$GIT_URL"
} }
release () { release () {