From b99e016aa628c3e3f6683ca3b049c98e3902a6e7 Mon Sep 17 00:00:00 2001 From: jnats Date: Mon, 26 Apr 2021 10:23:34 +0100 Subject: plenty of fixes --- install.sh | 2 +- nofetch | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/install.sh b/install.sh index 1f6ff17..6040386 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env FILE=./nofetch diff --git a/nofetch b/nofetch index b771894..d383fa5 100755 --- a/nofetch +++ b/nofetch @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [[ $1 == "" ]]; then @@ -13,14 +13,14 @@ else fi -if [ $(uname -s) == "Darwin" ] +if [ -d /Library ] then - osname="macOS/" -elif [ $(uname -s) == "FreeBSD" ] + osname="macOS" +elif [ -f /etc/os-release ] then - osname="" + osname=$(cat /etc/os-release | grep -w NAME | head -1 | sed 's/NAME=//g' | sed 's/\"//g' | sed 's/ Linux//g') else - osname=$(cat /etc/os-release | grep -w NAME | head -1 | sed "s/NAME=//g" | sed "s/\"//g")" " + osname="Unknown" fi if [ $rng -eq 1 ] @@ -55,17 +55,14 @@ then nofetch="plan 4 from the front door" elif [ $rng -eq 11 ] then - if [[ $osname == "Arch Linux" ]]; - then - nofetch="i use arch btw" - else - nofetch="i use "$osname" btw" - fi + nofetch="i use "$osname" btw" else nofetch="something has gone terribly wrong" fi +osname=$(echo $osname | sed 's/FreeBSD //g') + echo " " -echo " > $nofetch " -echo " > $osname$(uname -smr)" +echo " > $nofetch" | tr '[:upper:]' '[:lower:]' +echo " > $osname $(uname -smr)" | tr '[:upper:]' '[:lower:]' echo " " -- cgit v1.2.3