EnumDev/stormfetch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed chroot bugs and reduced executable size

Browse Source 
Stormfetch will now only list CPU and memory information if available
Added 'ldflag "-w"' to go build which reduces file size
Added 'run' goal to Makefile
This commit is contained in:
CapCreeperGR 2024-05-15 13:25:11 +03:00
parent 4a2833afff
commit 2984a7da5f
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -13,7 +13,7 @@ endif
build: build:
mkdir -p build mkdir -p build
$(GO) build -o build/stormfetch stormfetch $(GO) build -ldflags "-w" -o build/stormfetch stormfetch
install: build/stormfetch config/ install: build/stormfetch config/
mkdir -p $(DESTDIR)$(BINDIR) mkdir -p $(DESTDIR)$(BINDIR)
@ -29,5 +29,8 @@ compress: build/stormfetch config/
tar --owner=root --group=root -czf stormfetch.tar.gz stormfetch tar --owner=root --group=root -czf stormfetch.tar.gz stormfetch
rm -r stormfetch rm -r stormfetch
run: build/stormfetch
build/stormfetch
clean: clean:
rm -r build/ rm -r build/

8
config/fetch_script.sh
View File

@ -5,11 +5,15 @@ echo -e "${C3}Hostname: ${C4}$(cat /etc/hostname)"
echo -e "${C3}Kernel: ${C4}$(uname -s) $(uname -r)" echo -e "${C3}Kernel: ${C4}$(uname -s) $(uname -r)"
echo -e "${C3}Packages: ${C4}$(get_packages)" echo -e "${C3}Packages: ${C4}$(get_packages)"
echo -e "${C3}Shell: ${C4}${USER_SHELL}" echo -e "${C3}Shell: ${C4}${USER_SHELL}"
echo -e "${C3}CPU: ${C4}${CPU_MODEL} (${CPU_THREADS} threads)" if [ ! -z "$CPU_MODEL" ]; then
echo -e "${C3}CPU: ${C4}${CPU_MODEL} (${CPU_THREADS} threads)"
fi
if [ ! -z "$GPU_MODEL" ]; then if [ ! -z "$GPU_MODEL" ]; then
echo -e "${C3}GPU: ${C4}${GPU_MODEL}" echo -e "${C3}GPU: ${C4}${GPU_MODEL}"
fi fi
echo -e "${C3}Memory: ${C4}${MEM_USED} MiB / ${MEM_TOTAL} MiB" if [ ! -z "$MEM_TOTAL" ] && [ ! -z "$MEM_USED" ]; then
echo -e "${C3}Memory: ${C4}${MEM_USED} MiB / ${MEM_TOTAL} MiB"
fi
if xhost >& /dev/null ; then if xhost >& /dev/null ; then
if [ ! -z "$DE_WM" ]; then if [ ! -z "$DE_WM" ]; then
echo -e "${C3}DE/WM: ${C4}${DE_WM}" echo -e "${C3}DE/WM: ${C4}${DE_WM}"

8
main.go
View File

@ -144,9 +144,11 @@ func readConfig() {
cmd.Env = append(cmd.Env, "CPU_MODEL="+getCPUName()) cmd.Env = append(cmd.Env, "CPU_MODEL="+getCPUName())
cmd.Env = append(cmd.Env, "CPU_THREADS="+strconv.Itoa(getCPUThreads())) cmd.Env = append(cmd.Env, "CPU_THREADS="+strconv.Itoa(getCPUThreads()))
memory := GetMemoryInfo() memory := GetMemoryInfo()
cmd.Env = append(cmd.Env, "MEM_TOTAL="+strconv.Itoa(memory.MemTotal)) if memory != nil {
cmd.Env = append(cmd.Env, "MEM_USED="+strconv.Itoa(memory.MemTotal-memory.MemAvailable)) cmd.Env = append(cmd.Env, "MEM_TOTAL="+strconv.Itoa(memory.MemTotal))
cmd.Env = append(cmd.Env, "MEM_FREE="+strconv.Itoa(memory.MemAvailable)) cmd.Env = append(cmd.Env, "MEM_USED="+strconv.Itoa(memory.MemTotal-memory.MemAvailable))
cmd.Env = append(cmd.Env, "MEM_FREE="+strconv.Itoa(memory.MemAvailable))
}
cmd.Env = append(cmd.Env, "DE_WM="+GetDEWM()) cmd.Env = append(cmd.Env, "DE_WM="+GetDEWM())
cmd.Env = append(cmd.Env, "USER_SHELL="+GetShell()) cmd.Env = append(cmd.Env, "USER_SHELL="+GetShell())
if getGPUName() != "" { if getGPUName() != "" {

10
utils.go
View File

@ -108,6 +108,9 @@ func getCPUName() string {
if err != nil { if err != nil {
return "" return ""
} }
if len(cpu.Processors) == 0 {
return ""
}
return cpu.Processors[0].Model return cpu.Processors[0].Model
} }
@ -141,7 +144,7 @@ type Memory struct {
MemAvailable int MemAvailable int
} }
func GetMemoryInfo() Memory { func GetMemoryInfo() *Memory {
toInt := func(raw string) int { toInt := func(raw string) int {
if raw == "" { if raw == "" {
return 0 return 0
@ -159,6 +162,9 @@ func GetMemoryInfo() Memory {
return keyValue[0], toInt(keyValue[1]) return keyValue[0], toInt(keyValue[1])
} }
if _, err := os.Stat("/proc/meminfo"); err != nil {
return nil
}
file, err := os.Open("/proc/meminfo") file, err := os.Open("/proc/meminfo")
if err != nil { if err != nil {
panic(err) panic(err)
@ -178,7 +184,7 @@ func GetMemoryInfo() Memory {
res.MemAvailable = value / 1024 res.MemAvailable = value / 1024
} }
} }
return res return &res
} }
func GetShell() string { func GetShell() string {