github/screenFetch
1
1
Fork 0
mirror of https://github.com/KittyKatt/screenFetch.git synced 2026-04-24 03:00:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs for busybox systems:

Browse Source 
- BusyBox detection was TinyCore-only
- ps -p failed
- $USER unavailable
This commit is contained in:
Nero
2016-10-26 22:19:36 +00:00
parent 0f516ae237
commit fa79fa91fe
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
screenfetch-dev
View File

@@ -954,6 +954,7 @@ detectdistro () {
detecthost () {
myUser=${USER}
myHost=${HOSTNAME}
if [[ -z "$USER" ]]; then myUser=$(whoami); fi
if [[ "${distro}" == "Mac OS X" ]]; then myHost=${myHost/.local}; fi
verboseOut "Finding hostname and user...found as '${myUser}@${myHost}'"
}
@@ -1426,17 +1427,13 @@ detectshell_ver () {
}
detectshell () {
if [[ ! "${shell_type}" ]]; then
if [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" || "${distro}" == "Haiku" || "${distro}" == "Alpine Linux" || "${OSTYPE}" == "gnu" ]]; then
if [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" || "${distro}" == "Haiku" || "${distro}" == "Alpine Linux" || "${OSTYPE}" == "gnu" || "${distro}" == "TinyCore" ]]; then
shell_type=$(echo "$SHELL" | awk -F'/' '{print $NF}')
elif [[ "${distro}" == "TinyCore" ]]; then
if [[ "$(readlink "$SHELL")" == "busybox" ]]; then
shell_type="BusyBox"
else
shell_type=$(echo "$SHELL" | awk -F'/' '{print $NF}')
fi
elif readlink -f "$SHELL" | grep -q "busybox"; then
shell_type="BusyBox"
else
if [[ "${OSTYPE}" == "linux-gnu" || "${OSTYPE}" == "linux" || "${OSTYPE}" == "linux-musl" ]]; then
shell_type=$(ps -p $PPID -o cmd --no-heading)
shell_type=$(cat /proc/$PPID/cmdline|tr '\0' '\n'|head -n 1)
elif [[ "${distro}" == "Mac OS X" || "${distro}" == "DragonFlyBSD" || "${distro}" == "FreeBSD" || "${distro}" == "OpenBSD" || "${distro}" == "NetBSD" ]]; then
shell_type=$(ps -p $PPID -o command | tail -1)
else