Compare commits

9 Commits
Author SHA1 Message Date
EnumDev 5ba86fdf1b Add sudo to CI/CD workflow 2026-04-18 18:15:22 +03:00
EnumDev 26af051000 Fix typo in CI/CD workflow 2026-04-18 18:11:28 +03:00
EnumDev b77dd0f621 Update actions/checkout to v6 2026-04-18 18:08:38 +03:00
EnumDev 47fb9b0e64 Add changelog 2026-04-18 18:06:28 +03:00
EnumDev c712f1528a Add CI/CD pipeline 2026-04-18 18:00:50 +03:00
EnumDev 33b346785b Update debian package source 2026-04-18 17:36:09 +03:00
EnumDev f04a4b000a Add debian package source 2026-04-17 17:47:33 +03:00
EnumDev 3fdafd5c0c Add .gitignore 2026-04-17 16:12:17 +03:00
EnumDev da463b35e3 Separate monitor detection code into different program 2026-04-17 13:14:04 +03:00
26 changed files with 265 additions and 33 deletions
+61
View File
@@ -0,0 +1,61 @@
name: CI/CD pipeline
on:
push:
branches:
- "**"
pull_request:
branches:
- master
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Fetch repository
uses: actions/checkout@v6
- name: Upgrade packages
run: sudo apt update -y && sudo apt upgrade -y
- name: Download and install dependencies
run: sudo apt install -y make golang libgl-dev libx11-dev libxcursor-dev libxi-dev libxinerama-dev libxrandr-dev libxxf86vm-dev
- name: Build using make
run: make PREFIX=/usr SYSCONFDIR=/etc
- name: Install to root using make
run: sudo make PREFIX=/usr SYSCONFDIR=/etc install
- name: Run stormfetch
run: stormfetch
publish:
runs-on: ubuntu-latest
needs: test
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && needs.test.result == 'success'
steps:
- name: Fetch repository
uses: actions/checkout@v6
- name: Check debian changelog version
run: test $(grep '^stormfetch' debian/changelog | head -n1 | grep -Po '(?<=\().*(?=\))' | cut -d '-' -f1) == ${{ github.ref_name }}
- name: Upgrade packages
run: sudo apt update -y && sudo apt upgrade -y
- name: Download and install dependencies
run: sudo apt install -y make debhelper golang libgl-dev libx11-dev libxcursor-dev libxi-dev libxinerama-dev libxrandr-dev libxxf86vm-dev
- name: Build deb package
run: dpkg-buildpackage -b
- name: Read changelog
id: read_changelog
run: |
r=$(cat CHANGELOG.md) # Read CHANGELOG.md
r="${r//'%'/'%25'}" # Multiline escape sequences for %
r="${r//$'\n'/'%0A'}" # Multiline escape sequences for '\n'
r="${r//$'\r'/'%0D'}" # Multiline escape sequences for '\r'
echo "RELEASE_BODY=$r" >> $GITHUB_OUTPUT # Set environment variable
- name: Upload deb packages release
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
release_name: v${{ github.ref_name }}
file: ../*.deb
tag: ${{ github.ref }}
overwrite: true
file_glob: true
draft: true
body: |
${{ steps.read_changelog.outputs.RELEASE_BODY }}
+10
View File
@@ -0,0 +1,10 @@
# Ignore IDE directories
/.idea
# Ignore build directories
/build
/deb/temp
/deb/out
# Ignore act files
event.json
+9
View File
@@ -0,0 +1,9 @@
# Stormfetch v8.0 Changelog
### Changes:
- [Add CI/CD pipeline](https://github.com/EnumeratedDev/stormfetch/commit/c712f1528af45fcd7859b28b084c3dce64d6e07c)
- [Add debian package source](https://github.com/EnumeratedDev/stormfetch/commit/f04a4b000a419181dd5eb940440676260beaae5f)
- [Separate monitor detection code into different program](https://github.com/EnumeratedDev/stormfetch/commit/da463b35e36eb4413d6ffc258f12398015fedb2b)
### Fixes
- [Return unknown GPU if device info is nil](https://github.com/EnumeratedDev/stormfetch/commit/8dfe7b3a0e0c1f95d34020b1f3fda5142f113671)
- [Fix bash version checking](https://github.com/EnumeratedDev/stormfetch/commit/8147d302c8a8d170c6942378b4b74eac77d755ac)
- [Fix multiple spaces when version number is empty](https://github.com/EnumeratedDev/stormfetch/commit/a919ffb71b78d706062030203029ef470b190e9c)
+27 -6
View File
@@ -1,24 +1,44 @@
# Installation paths
PREFIX ?= /usr/local
BINDIR ?= $(PREFIX)/bin
LIBEXECDIR ?= $(PREFIX)/libexec
SYSCONFDIR := $(PREFIX)/etc
# Compilers and tools
GO ?= go
# Compiler flags
GOOS ?= $(shell $(GO) env | grep '^GOOS' | cut -d'=' -f2 | tr -d "'")
GOARCH ?= $(shell $(GO) env | grep '^GOARCH' | cut -d'=' -f2 | tr -d "'")
LDFLAGS ?= -w
# Build-time variables
VERSION ?= $(shell git describe --tags --dirty)
build:
mkdir -p build
cd src; $(GO) build -ldflags "-w -X 'main.StormfetchVersion=$(VERSION)' -X 'main.SystemConfigDir=$(SYSCONFDIR)'" -o ../build/stormfetch stormfetch
build: build-stormfetch build-stormfetch-monitor-detection
install: build/stormfetch config/
# Create directoriy
build-stormfetch:
install -d build
cd src/stormfetch; GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO) build -ldflags "$(LDFLAGS) -X 'main.StormfetchVersion=$(VERSION)' -X 'main.SystemConfigDir=$(SYSCONFDIR)' -X 'main.LibexecDir=$(LIBEXECDIR)'" -o ../../build/stormfetch
build-stormfetch-monitor-detection:
install -d build
cd src/stormfetch-monitor-detection; GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO) build -ldflags "$(LDFLAGS)" -o ../../build/stormfetch-monitor-detection
install: install-stormfetch install-stormfetch-monitor-detection install-config
install-stormfetch: build/stormfetch
# Create directory
install -dm755 $(DESTDIR)$(BINDIR)
# Install binary
install -m755 build/stormfetch $(DESTDIR)$(BINDIR)/stormfetch
install-stormfetch-monitor-detection: build/stormfetch-monitor-detection
# Create directory
install -dm755 $(DESTDIR)$(LIBEXECDIR)
# Install binary
install -m755 build/stormfetch-monitor-detection $(DESTDIR)$(LIBEXECDIR)/stormfetch-monitor-detection
install-config:
# Create directory
install -dm755 $(DESTDIR)$(SYSCONFDIR)
@@ -27,9 +47,10 @@ install-config:
uninstall:
-rm -f $(DESTDIR)$(BINDIR)/stormfetch
-rm -f $(DESTDIR)$(LIBEXEDIR)/stormfetch-monitor-detection
-rm -rf $(DESTDIR)$(SYSCONFDIR)/stormfetch
clean:
rm -r build/
.PHONY: build install install-config uninstall clean
.PHONY: build build-stormfetch build-stormfetch-monitor-detection install install-config uninstall clean
+5 -1
View File
@@ -11,7 +11,11 @@ At the moment ascii art for different distributions is limited. If you would lik
### Installation Guide
#### Using a package manager
- Arch Linux: You may use your favorite AUR manager to install the `stormfetch` package
| Distribution | Package name |
|:----------------------:|:------------------------------------------ |
| Arch Linux/Artix Linux | `stormfetch` from the AUR |
| Debian/Ubuntu | latest .deb file from the releases section |
| Tide Linux | `stormfetch` from the main repository |
#### Building from source
- Download `go` from your package manager or from the go website
- Download `make` from your package manager
+13
View File
@@ -0,0 +1,13 @@
stormfetch (7.4-1) trixie; urgency=medium
* Fix version number
* Update debian codename
* Fix debhelper dependency
-- EnumDev <[email protected]> Sat, 18 Apr 2026 14:18:37 +0300
stormfetch (7.4.3-1) stretch; urgency=medium
* Initial packaging work with dpkg-buildpackage.
-- EnumDev <[email protected]> Fri, 17 Apr 2026 16:54:39 +0300
+1
View File
@@ -0,0 +1 @@
9
+27
View File
@@ -0,0 +1,27 @@
Source: stormfetch
Priority: optional
Maintainer: EnumDev <[email protected]>
Build-Depends:
debhelper (>= 9),
libgl-dev,
libx11-dev,
libxcursor-dev,
libxi-dev,
libxinerama-dev,
libxrandr-dev,
libxxf86vm-dev
Vcs-Git: https://github.com/EnumeratedDev/stormfetch.git
Vcs-Browser: https://github.com/EnumeratedDev/stormfetch
Package: stormfetch
Section: universe/utils
Architecture: any
Depends: bash
Suggests: stormfetch-monitor-detection
Description: A linux fetch program written in go
Package: stormfetch-monitor-detection
Section: universe/utils
Architecture: any
Depends: stormfetch,libgl1,libx11-6,libxcursor1,libxi6,libxinerama1,libxrandr2,libxxf86vm1
Description: Monitor detection utility for stormfetch
Vendored Executable
+22
View File
@@ -0,0 +1,22 @@
#!/usr/bin/make -f
clean:
-rm -r debian/stormfetch
-rm -r debian/stormfetch-monitor-detection
build:
# Build program
make PREFIX=/usr SYSCONFDIR=/etc
binary:
# Create directories
mkdir -p debian/stormfetch
mkdir -p debian/stormfetch-monitor-detection
# Install program
make DESTDIR=debian/stormfetch PREFIX=/usr SYSCONFDIR=/etc install-stormfetch
make DESTDIR=debian/stormfetch PREFIX=/usr SYSCONFDIR=/etc install-config
# Install monitor detection program
make DESTDIR=debian/stormfetch-monitor-detection PREFIX=/usr SYSCONFDIR=/etc install-stormfetch-monitor-detection
# Finalize packages
dh_gencontrol
dh_builddeb
+5
View File
@@ -0,0 +1,5 @@
module stormfetch-monitor-detection
go 1.24.0
require github.com/go-gl/glfw/v3.3/glfw v0.0.0-20260406072232-3ac4aa2bb164
+2
View File
@@ -0,0 +1,2 @@
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20260406072232-3ac4aa2bb164 h1:ddtotcEXIT7dFhSeXIWjK8YMFYl5bB2NdYQwgv6Uqjk=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20260406072232-3ac4aa2bb164/go.mod h1:SyRD8YfuKk+ZXlDqYiqe1qMSqjNgtHzBTG810KUagMc=
+33
View File
@@ -0,0 +1,33 @@
package main
import (
"fmt"
"os"
"strconv"
"github.com/go-gl/glfw/v3.3/glfw"
)
func main() {
defer func() {
if r := recover(); r != nil {
os.Exit(1)
}
}()
err := glfw.Init()
if err != nil {
os.Exit(1)
}
for _, monitor := range glfw.GetMonitors() {
mode := monitor.GetVideoMode()
fmt.Print(monitor.GetName() + ",")
fmt.Print(strconv.Itoa(mode.Width) + ",")
fmt.Print(strconv.Itoa(mode.Height) + ",")
fmt.Print(strconv.Itoa(mode.RefreshRate))
fmt.Println()
}
defer glfw.Terminate()
}
-1
View File
@@ -3,7 +3,6 @@ module stormfetch
go 1.24.0
require (
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728
github.com/jackmordaunt/ghw v1.0.5
github.com/mitchellh/go-ps v1.0.0
gopkg.in/yaml.v3 v3.0.1
-11
View File
@@ -1,13 +1,5 @@
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728 h1:RkGhqHxEVAvPM0/R+8g7XRwQnHatO0KAuVcwHo8q9W8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728/go.mod h1:SyRD8YfuKk+ZXlDqYiqe1qMSqjNgtHzBTG810KUagMc=
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
github.com/jackmordaunt/ghw v1.0.4 h1:as+COFuPuXaNQC3WqzoHS/E2JYWZU7gN8ompNTUxNxs=
github.com/jackmordaunt/ghw v1.0.4/go.mod h1:4dReYvJ36CoAzIxlEx8du25Qi/YqKYvEGE9QJoRXiK8=
github.com/jackmordaunt/ghw v1.0.5 h1:3rTXwu0D9RkungV7/WlhC8HVuDlPaq0aKY8u0I51jLY=
github.com/jackmordaunt/ghw v1.0.5/go.mod h1:VpFlLXnJErgoRttR3WOxun4v5EE8/xfB4cK26G5q2U0=
github.com/jackmordaunt/pcidb v1.0.1 h1:uLLZa6kD5P39r2cwMyJJkxmuHfH9Wq19gYQEbYcB0Z4=
@@ -21,10 +13,7 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+45 -10
View File
@@ -3,11 +3,12 @@ package main
import (
"fmt"
"os"
"os/exec"
"path"
"slices"
"strconv"
"strings"
"github.com/go-gl/glfw/v3.3/glfw"
"github.com/jackmordaunt/ghw"
)
@@ -29,6 +30,7 @@ type GPU struct {
}
type Monitor struct {
Name string
Width int
Height int
RefreshRate int
@@ -195,22 +197,55 @@ func GetMotherboardModel() string {
func GetMonitors() []Monitor {
var monitors []Monitor
if GetDisplayProtocol() != "" {
err := glfw.Init()
if err != nil {
panic(err)
// Find stormfetch-monitor-detection program
execPath, _ := os.Executable()
possiblePaths := []string{
path.Join(path.Dir(execPath), "stormfetch-monitor-detection"),
path.Join(LibexecDir, "stormfetch-monitor-detection"),
}
for _, monitor := range glfw.GetMonitors() {
mode := monitor.GetVideoMode()
monitorDetectionPath := ""
for _, path := range possiblePaths {
if _, err := os.Stat(path); err == nil {
monitorDetectionPath = path
break
}
}
if monitorDetectionPath == "" {
return nil
}
// Get monitor detection program output
output, err := exec.Command(monitorDetectionPath).Output()
if err != nil {
return nil
}
// Parse output
for line := range strings.SplitSeq(strings.TrimSpace(string(output)), "\n") {
lineSplit := strings.Split(line, ",")
if len(lineSplit) != 4 {
continue
}
name := lineSplit[0]
width, err := strconv.Atoi(lineSplit[1])
height, err := strconv.Atoi(lineSplit[2])
refreshRate, err := strconv.Atoi(lineSplit[3])
if err != nil {
continue
}
monitors = append(monitors, Monitor{
Width: mode.Width,
Height: mode.Height,
RefreshRate: mode.RefreshRate,
Name: name,
Width: width,
Height: height,
RefreshRate: refreshRate,
})
}
defer glfw.Terminate()
}
return monitors
}
+1
View File
@@ -12,6 +12,7 @@ import (
// Build-time variables
var StormfetchVersion = "dev"
var SystemConfigDir = "/etc/"
var LibexecDir = "/libexec/"
// Flag variables
var ShowVersion = false
+4 -4
View File
@@ -405,15 +405,15 @@ func initializeModuleMap() {
RegisterModule(dewmModule)
// Monitors module
monitorsModule := StormfetchModule{stormfetchModuleConfig: stormfetchModuleConfig{Name: "monitors", Format: "%3Monitor: %4${MONITOR_WIDTH}x${MONITOR_HEIGHT} ${MONITOR_REFRESH_RATE}Hz"}, Execute: func(sm StormfetchModule) string {
monitorsModule := StormfetchModule{stormfetchModuleConfig: stormfetchModuleConfig{Name: "monitors", Format: "%3Monitor ${MONITOR_NAME}: %4${MONITOR_WIDTH}x${MONITOR_HEIGHT} ${MONITOR_REFRESH_RATE}Hz"}, Execute: func(sm StormfetchModule) string {
builder := strings.Builder{}
monitors := GetMonitors()
for i, monitor := range monitors {
for _, monitor := range monitors {
expanded := os.Expand(sm.Format, func(s string) string {
switch s {
case "MONITOR_NUM":
return strconv.Itoa(i + 1)
case "MONITOR_NAME":
return monitor.Name
case "MONITOR_WIDTH":
return strconv.Itoa(monitor.Width)
case "MONITOR_HEIGHT":