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

Fixed error when attempting to use stormfetch without being connected to the internet and simplified fetch script

Browse Source
This commit is contained in:
EnumDev 2024-09-06 18:49:50 +03:00
parent c5e02c07b5
commit 20cf7fe869
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/fetch_script.sh
View File

@ -7,14 +7,13 @@ echo -e "${C3}Packages: ${C4}$(get_packages)"
echo -e "${C3}Shell: ${C4}${USER_SHELL}" echo -e "${C3}Shell: ${C4}${USER_SHELL}"
echo -e "${C3}Init: ${C4}${INIT_SYSTEM}" echo -e "${C3}Init: ${C4}${INIT_SYSTEM}"
echo -e "${C3}Libc: ${C4}${LIBC}" echo -e "${C3}Libc: ${C4}${LIBC}"
if [ ! -z "$CPU_MODEL" ]; then echo -e "${C3}CPU: ${C4}${CPU_MODEL} (${CPU_THREADS} threads)"; fi [ -n "$CPU_MODEL" ] && echo -e "${C3}CPU: ${C4}${CPU_MODEL} (${CPU_THREADS} threads)"
for i in $(seq ${CONNECTED_GPUS}); do for i in $(seq "${CONNECTED_GPUS}"); do
gpu="GPU$i" gpu="GPU$i"
echo -e "${C3}GPU: ${C4}${!gpu}" echo -e "${C3}GPU: ${C4}${!gpu}"
done done
if [ ! -z "$MEM_TOTAL" ] && [ ! -z "$MEM_USED" ]; then echo -e "${C3}Memory: ${C4}${MEM_USED} MiB / ${MEM_TOTAL} MiB"; fi [ -n "$MEM_TOTAL" ] && [ -n "$MEM_USED" ] && echo -e "${C3}Memory: ${C4}${MEM_USED} MiB / ${MEM_TOTAL} MiB"
for i in $(seq ${MOUNTED_PARTITIONS}); do for i in $(seq "${MOUNTED_PARTITIONS}"); do
device="PARTITION${i}_DEVICE"
mountpoint="PARTITION${i}_MOUNTPOINT" mountpoint="PARTITION${i}_MOUNTPOINT"
label="PARTITION${i}_LABEL" label="PARTITION${i}_LABEL"
type="PARTITION${i}_TYPE" type="PARTITION${i}_TYPE"
@ -33,13 +32,13 @@ for i in $(seq ${MOUNTED_PARTITIONS}); do
echo -e "${C3}Partition ${!label} (${!type}): ${C4}${!used}/${!total}" echo -e "${C3}Partition ${!label} (${!type}): ${C4}${!used}/${!total}"
fi fi
fi fi
done done
echo -e "${C3}Local IPv4 Address: ${C4}${LOCAL_IPV4}" [ -n "$LOCAL_IPV4" ] && echo -e "${C3}Local IPv4 Address: ${C4}${LOCAL_IPV4}"
if [ ! -z "$DISPLAY_PROTOCOL" ]; then if [ -n "$DISPLAY_PROTOCOL" ]; then
echo -e "${C3}Display Protocol: ${C4}${DISPLAY_PROTOCOL}" echo -e "${C3}Display Protocol: ${C4}${DISPLAY_PROTOCOL}"
for i in $(seq ${CONNECTED_MONITORS}); do for i in $(seq "${CONNECTED_MONITORS}"); do
monitor="MONITOR$i" monitor="MONITOR$i"
echo -e "${C3}Screen $i: ${C4}${!monitor}" echo -e "${C3}Screen $i: ${C4}${!monitor}"
done done
fi fi
if [ ! -z "$DE_WM" ]; then echo -e "${C3}DE/WM: ${C4}${DE_WM}"; fi [ -n "$DE_WM" ] && echo -e "${C3}DE/WM: ${C4}${DE_WM}"

2
utils.go
View File

@ -439,7 +439,7 @@ func GetLibc() string {
func GetLocalIP() string { func GetLocalIP() string {
conn, err := net.Dial("udp", "8.8.8.8:80") conn, err := net.Dial("udp", "8.8.8.8:80")
if err != nil { if err != nil {
log.Fatal(err) return ""
} }
defer conn.Close() defer conn.Close()