summaryrefslogtreecommitdiff
path: root/argv.Version.go
diff options
context:
space:
mode:
Diffstat (limited to 'argv.Version.go')
-rw-r--r--argv.Version.go27
1 files changed, 18 insertions, 9 deletions
diff --git a/argv.Version.go b/argv.Version.go
index 0318c62..c50c52a 100644
--- a/argv.Version.go
+++ b/argv.Version.go
@@ -10,28 +10,37 @@ import (
"go.wit.com/log"
)
+// returns the name of the executable registered for shell autocomplete
+func GetAPPNAME() string {
+ return me.pb.AppInfo.APPNAME
+}
+
func (pb *Argv) Version() string {
- return pb.getVersion()
+ return pb.AppInfo.getVersion()
}
func doVersion(pb *Argv) {
- log.Info(pb.getVersion())
+ log.Info(pb.AppInfo.getVersion())
os.Exit(0)
}
-func (pb *Argv) getVersion() string {
+func (info *App) getVersion() string {
var s string
- timeString, _, err := cobol.TimeCheck(me.BUILDTIME)
- if err == nil {
- s = fmt.Sprintf("%s %s Built on %s (argv.got(%s))", me.ARGNAME, me.VERSION, timeString, me.BUILDTIME)
+ timeString, t, err := cobol.TimeCheck(info.BUILDTIME)
+ if t != nil {
+ // log.Printf("TIME getVersion(t != nil) ERR=(%v) t=(%v) AppInfo.BUILTIME is=(%v)\n", err, t, info.BUILDTIME)
+ return fmt.Sprintf("%s %s Built on %s", info.APPNAME, info.VERSION, cobol.Time(t))
+ } else if err == nil {
+ s = fmt.Sprintf("%s %s Built on %s (argv.had(%s))", info.APPNAME, info.VERSION, timeString, info.BUILDTIME)
} else {
- s = fmt.Sprintf("%s %s Built on raw(%v) %s (from argv)", me.ARGNAME, me.VERSION, me.BUILDTIME, "argv.time.err")
+ log.Printf("TIME getVersion() ERR=(%v) timeString=(%v) AppInfo.BUILTIME was=(%v)\n", err, timeString, info.BUILDTIME)
+ s = fmt.Sprintf("%s %s Built on raw(%v) (argv had %s)", info.APPNAME, info.VERSION, timeString, info.BUILDTIME)
}
return s
}
/*
-func StandardVersion(ARGNAME, VERSION, BUILDTIME string) string {
- return fmt.Sprintf("%s %s Built on raw(%v) %s (from argv)", ARGNAME, VERSION, BUILDTIME, cobol.Time(BUILDTIME))
+func StandardVersion(APPNAME, VERSION, BUILDTIME string) string {
+ return fmt.Sprintf("%s %s Built on raw(%v) %s (from argv)", APPNAME, VERSION, BUILDTIME, cobol.Time(BUILDTIME))
}
*/