third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-05-07 13:51:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 598b80e7be5c64d27659c05054b04cfc91bd323b into 6f52c0201cdc6e92bf4e47394d79767db9c33640

Browse Source
This commit is contained in:
Rob Emery 2025-04-20 11:02:05 +02:00 committed by GitHub
commit 8cc5b361a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/metrics/insights.go
View File

@ -6,6 +6,7 @@ import (
"encoding/json" "encoding/json"
"math" "math"
"net/http" "net/http"
"os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"runtime/debug" "runtime/debug"
@ -153,6 +154,13 @@ var staticData = sync.OnceValue(func() insights.Data {
data.Build.Settings, data.Build.GoVersion = buildInfo() data.Build.Settings, data.Build.GoVersion = buildInfo()
data.OS.Containerized = consts.InContainer data.OS.Containerized = consts.InContainer
// Install info
packageFilename := filepath.Join(conf.Server.DataFolder, ".package")
packageFileData, err := os.ReadFile(packageFilename)
if err == nil {
data.OS.Package = string(packageFileData)
}
// OS info // OS info
data.OS.Type = runtime.GOOS data.OS.Type = runtime.GOOS
data.OS.Arch = runtime.GOARCH data.OS.Arch = runtime.GOARCH

1
core/metrics/insights/data.go
View File

@ -16,6 +16,7 @@ type Data struct {
Containerized bool `json:"containerized"` Containerized bool `json:"containerized"`
Arch string `json:"arch"` Arch string `json:"arch"`
NumCPU int `json:"numCPU"` NumCPU int `json:"numCPU"`
Package string `json:"package,omitempty"`
} `json:"os"` } `json:"os"`
Mem struct { Mem struct {
Alloc uint64 `json:"alloc"` Alloc uint64 `json:"alloc"`

5
release/linux/postinstall.sh
View File

@ -14,6 +14,11 @@ if [ ! -f /etc/navidrome/navidrome.toml ]; then
fi fi
postinstall_flag="/var/lib/navidrome/.installed" postinstall_flag="/var/lib/navidrome/.installed"
package_file="/var/lib/navidrome/.package"
if [ ! -f "$package_file" ]; then
echo "deb/rpm" > "$package_file";
fi
if [ ! -f "$postinstall_flag" ]; then if [ ! -f "$postinstall_flag" ]; then
# The primary reason why this would fail is if the service was already installed AND # The primary reason why this would fail is if the service was already installed AND

3
release/wix/build_msi.sh
View File

@ -49,6 +49,9 @@ cp "${DOWNLOAD_FOLDER}"/extracted_ffmpeg/${FFMPEG_FILE}/bin/ffmpeg.exe "$MSI_OUT
cp "$WORKSPACE"/LICENSE "$WORKSPACE"/README.md "$MSI_OUTPUT_DIR" cp "$WORKSPACE"/LICENSE "$WORKSPACE"/README.md "$MSI_OUTPUT_DIR"
cp "$BINARY" "$MSI_OUTPUT_DIR" cp "$BINARY" "$MSI_OUTPUT_DIR"
# package type indicator file
echo "msi" > "$MSI_OUTPUT_DIR/.package"
# workaround for wixl WixVariable not working to override bmp locations # 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 cp "$WORKSPACE"/release/wix/bmp/banner.bmp /usr/share/wixl-*/ext/ui/bitmaps/bannrbmp.bmp
cp "$WORKSPACE"/release/wix/bmp/dialogue.bmp /usr/share/wixl-*/ext/ui/bitmaps/dlgbmp.bmp cp "$WORKSPACE"/release/wix/bmp/dialogue.bmp /usr/share/wixl-*/ext/ui/bitmaps/dlgbmp.bmp

7
release/wix/navidrome.wxs
View File

@ -69,6 +69,12 @@
</Directory> </Directory>
</Directory> </Directory>
<Directory Id="ND_DATAFOLDER" name="[ND_DATAFOLDER]">
<Component Id='PackageFile' Guid='9eec0697-803c-4629-858f-20dc376c960b' Win64="$(var.Win64)">
<File Id='package' Name='.package' DiskId='1' Source='.package' KeyPath='no' />
</Component>
</Directory>
</Directory> </Directory>
<InstallUISequence> <InstallUISequence>
@ -81,6 +87,7 @@
<ComponentRef Id='Configuration'/> <ComponentRef Id='Configuration'/>
<ComponentRef Id='MainExecutable' /> <ComponentRef Id='MainExecutable' />
<ComponentRef Id='FFMpegExecutable' /> <ComponentRef Id='FFMpegExecutable' />
<ComponentRef Id='PackageFile' />
</Feature> </Feature>
</Product> </Product>
</Wix> </Wix>