Skip to content

Commit 12dbe6f

Browse files
committed
feat: add -version flag for jetkvm_app
1 parent 36cd649 commit 12dbe6f

File tree

4 files changed

+45
-2
lines changed

4 files changed

+45
-2
lines changed

cmd/main.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,32 @@
11
package main
22

33
import (
4+
"flag"
5+
"fmt"
6+
47
"github.com/jetkvm/kvm"
8+
"github.com/prometheus/common/version"
59
)
610

11+
func printVersion() {
12+
version.Version = kvm.GetBuiltAppVersion()
13+
app_version := version.Print("JetKVM Application")
14+
fmt.Println(app_version)
15+
16+
nativeVersion, err := kvm.GetNativeVersion()
17+
if err == nil {
18+
fmt.Println("\nJetKVM Native, version", nativeVersion)
19+
}
20+
}
21+
722
func main() {
23+
versionPtr := flag.Bool("version", false, "print version and exit")
24+
flag.Parse()
25+
26+
if *versionPtr {
27+
printVersion()
28+
return
29+
}
30+
831
kvm.Main()
932
}

dev_deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ cd "${REMOTE_PATH}"
174174
chmod +x jetkvm_app_debug
175175
176176
# Run the application in the background
177-
PION_LOG_TRACE=${LOG_TRACE_SCOPES} ./jetkvm_app_debug
177+
PION_LOG_TRACE=${LOG_TRACE_SCOPES} ./jetkvm_app_debug | tee -a /tmp/jetkvm_app_debug.log
178178
EOF
179179

180180
echo "Deployment complete."

native.go

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,14 +282,30 @@ func shouldOverwrite(destPath string, srcHash []byte) bool {
282282
return !bytes.Equal(srcHash, dstHash)
283283
}
284284

285+
func getNativeSha256() ([]byte, error) {
286+
version, err := resource.ResourceFS.ReadFile("jetkvm_native.sha256")
287+
if err != nil {
288+
return nil, err
289+
}
290+
return version, nil
291+
}
292+
293+
func GetNativeVersion() (string, error) {
294+
version, err := getNativeSha256()
295+
if err != nil {
296+
return "", err
297+
}
298+
return string(version), nil
299+
}
300+
285301
func ensureBinaryUpdated(destPath string) error {
286302
srcFile, err := resource.ResourceFS.Open("jetkvm_native")
287303
if err != nil {
288304
return err
289305
}
290306
defer srcFile.Close()
291307

292-
srcHash, err := resource.ResourceFS.ReadFile("jetkvm_native.sha256")
308+
srcHash, err := getNativeSha256()
293309
if err != nil {
294310
nativeLogger.Debug().Msg("error reading embedded jetkvm_native.sha256, proceeding with update")
295311
srcHash = nil

ota.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ const UpdateMetadataUrl = "https://api.jetkvm.com/releases"
5050

5151
var builtAppVersion = "0.1.0+dev"
5252

53+
func GetBuiltAppVersion() string {
54+
return builtAppVersion
55+
}
56+
5357
func GetLocalVersion() (systemVersion *semver.Version, appVersion *semver.Version, err error) {
5458
appVersion, err = semver.NewVersion(builtAppVersion)
5559
if err != nil {

0 commit comments

Comments
 (0)