From 679b0f0f4ea850ce49b68e00643b0f16385fe460 Mon Sep 17 00:00:00 2001 From: 1138-4EB <1138-4EB@users.noreply.github.com> Date: Wed, 22 Aug 2018 13:15:55 +0100 Subject: [PATCH] chore(version): set CLI version from lib Former-commit-id: 687a0a5f65c1e246110f11832a74aff227aea9b1 [formerly 6066fdbdd709de04a8362868084f70fb04a24c66] [formerly c29860d9846fe01aadffd393753265294749fc3f [formerly 0c53f06c642e085f0886e9e5e4985ce276059c30]] Former-commit-id: cc10a50da0a49f97455a59a7e6e8145460168407 [formerly ea1aae8d790840e5ac7e86556f59316b476b1218] Former-commit-id: ccc7c07a75dffcd5306a537bef2a5dce8a8f6051 --- build/build.sh | 2 +- cli/cmd/root.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/build.sh b/build/build.sh index 9e3c099c..2c93a7d3 100755 --- a/build/build.sh +++ b/build/build.sh @@ -11,7 +11,7 @@ if [ "$COMMIT_SHA" != "" ]; then sed -i.bak "s|(untracked)|($COMMIT_SHA)|g" ../lib/filebrowser.go fi -echo "Build cmd/filebrowser" +echo "Build CLI" CGO_ENABLED=0 go build -a -o filebrowser if [ "$COMMIT_SHA" != "" ]; then diff --git a/cli/cmd/root.go b/cli/cmd/root.go index b1037c43..678adb24 100644 --- a/cli/cmd/root.go +++ b/cli/cmd/root.go @@ -4,6 +4,7 @@ import ( "log" "strings" + fb "github.com/filebrowser/filebrowser/lib" homedir "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" v "github.com/spf13/viper" @@ -14,7 +15,7 @@ var cfgFile string // rootCmd represents the base command when called without any subcommands var rootCmd = &cobra.Command{ Use: "filebrowser", - Version: "(untracked)", + Version: fb.Version, Aliases: []string{"serve"}, Short: "A stylish web-based file manager", Long: `Command 'serve' is the default. Filebrowser is started