diff --git a/core/metrics/insights.go b/core/metrics/insights.go index 8654dc678..f1b383977 100644 --- a/core/metrics/insights.go +++ b/core/metrics/insights.go @@ -155,7 +155,7 @@ var staticData = sync.OnceValue(func() insights.Data { data.OS.Containerized = consts.InContainer // Install info - packageFilename := filepath.Join(filepath.Dir(conf.Server.ConfigFile), "package") + packageFilename := filepath.Join(conf.Server.DataFolder, ".package") packageFileData, err := os.ReadFile(packageFilename) if err == nil { data.OS.Package = string(packageFileData) diff --git a/release/wix/build_msi.sh b/release/wix/build_msi.sh index c48e738dc..7e595311e 100755 --- a/release/wix/build_msi.sh +++ b/release/wix/build_msi.sh @@ -50,7 +50,7 @@ cp "$WORKSPACE"/LICENSE "$WORKSPACE"/README.md "$MSI_OUTPUT_DIR" cp "$BINARY" "$MSI_OUTPUT_DIR" # package type indicator file -echo "msi" > "$MSI_OUTPUT_DIR/package" +echo "msi" > "$MSI_OUTPUT_DIR/.package" # workaround for wixl WixVariable not working to override bmp locations cp "$WORKSPACE"/release/wix/bmp/banner.bmp /usr/share/wixl-*/ext/ui/bitmaps/bannrbmp.bmp diff --git a/release/wix/navidrome.wxs b/release/wix/navidrome.wxs index c64020fee..080740838 100644 --- a/release/wix/navidrome.wxs +++ b/release/wix/navidrome.wxs @@ -63,10 +63,6 @@ - - - - @@ -75,6 +71,12 @@ + + + + + + Not Installed AND NOT WIX_UPGRADE_DETECTED