From a6b5f4ded8c4d04288c9f88a63de47c84424d375 Mon Sep 17 00:00:00 2001 From: G2-Games Date: Sun, 18 Sep 2022 18:15:43 -0500 Subject: [PATCH] Fixed shell detection, made it more reliable (hopefully) --- install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 86a7e6b..549bf67 100755 --- a/install.sh +++ b/install.sh @@ -2,12 +2,12 @@ version=0.2.5 bashrc="/home/$USER/.bashrc" zshrc="/home/$USER/.zshrc" originaldir=$PWD -environment=$(readlink /proc/$$/exe | grep -o 'bash\|zsh') -if [[ "$environment" = "bash" ]] || [[ "$environment" = "zsh" ]]; +environment=$(ps -o args= -p $$ | egrep -m 1 -o '\w{0,5}sh' | head -1) +if [ "$environment" = "bash" ] || [ "$environment" = "zsh" ]; then if ! grep -q 'bash /home/$USER/.welcome/welcome.sh' $bashrc && ! grep -q 'zsh /home/$USER/.welcome/welcome.sh' $zshrc; then - echo "Welcome! Installing..." + echo "Welcome! Installing in $environment..." tput sc cd /home/$USER mkdir -p /home/$USER/.welcome