Added preliminary support for zsh

This commit is contained in:
G2-Games 2022-09-03 18:30:32 -05:00
parent fbae8a9b72
commit 35c1b60a56
2 changed files with 51 additions and 30 deletions

View file

@ -1,36 +1,57 @@
#!/bin/bash
#!/bin/zsh
version='0.1'
bashrc="/home/$USER/.bashrc"
zshrc="/home/$USER/.zshrc"
originaldir=$PWD
if ! grep -q 'bash /home/$USER/.welcome/welcome.sh' $bashrc;
environment=$(readlink /proc/$$/exe)
if [[ "$environment" = "/usr/bin/bash" ]] || [[ "$environment" = "/usr/bin/zsh" ]];
then
tput sc
echo "Welcome! Installing..."
cd /home/$USER
mkdir -p /home/$USER/.welcome
curl -SL https://github.com/G2-Games/welcome.sh/releases/download/v${version}/welcome.sh --output /home/$USER/.welcome/welcome.sh
chmod +x /home/$USER/.welcome/welcome.sh
echo 'bash /home/$USER/.welcome/welcome.sh' >> $bashrc
tput rc el ed
echo -e "\e[36mInstalled! \e[0m"
cd "$originaldir"
else
tput sc
echo -e "\e[35mwelcome.sh\e[0m already installed!"
echo -en "Do you want to \e[31muninstall \e[35mwelcome.sh\e[0m?\n\e[36mY/n\e[0m"
read -p " " -n 1 -r
echo
if [[ $REPLY =~ ^[Yy]$ ]]
if ! grep -q 'bash /home/$USER/.welcome/welcome.sh' $bashrc && ! grep -q 'zsh /home/$USER/.welcome/welcome.sh' $zshrc;
then
rm /home/$USER/.welcome/welcome.sh
rmdir /home/$USER/.welcome
sed -i 's#bash /home/$USER/.welcome/welcome.sh##g' $bashrc
tput sc
echo "Welcome! Installing..."
cd /home/$USER
mkdir -p /home/$USER/.welcome
curl -SL https://github.com/G2-Games/welcome.sh/releases/download/v${version}/welcome.sh --output /home/$USER/.welcome/welcome.sh
chmod +x /home/$USER/.welcome/welcome.sh
if [[ "$environment" = "/usr/bin/bash" ]];
then
echo 'bash /home/$USER/.welcome/welcome.sh' >> $bashrc
echo "Installing to bashrc"
elif [[ "$environment" = "/usr/bin/zsh" ]];
then
echo 'zsh /home/$USER/.welcome/welcome.sh' >> $zshrc
echo "Installing to zshrc"
fi
cd "$originaldir"
tput rc el ed
echo -e "\e[36mUninstalled! \e[0m"
echo -e "\e[36mInstalled! \e[0m"
else
tput rc el ed
echo -e "\e[32mCancelled. \e[0m"
tput sc
echo -e "\e[35mwelcome.sh\e[0m already installed!"
echo -en "Do you want to \e[31muninstall \e[35mwelcome.sh\e[0m?\n\e[36mY/n\e[0m"
if [[ "$environment" = "/usr/bin/bash" ]]
then
read -p " " -n 1 -r
elif [[ "$environment" = "/usr/bin/zsh" ]]
then
read -q "REPLY? " -n 1 -r
fi
echo
if [[ $REPLY =~ ^[Yy]$ ]]
then
rm /home/$USER/.welcome/welcome.sh
rmdir /home/$USER/.welcome
sed -i 's#bash /home/$USER/.welcome/welcome.sh##g' $bashrc # Try from both
sed -i 's#zsh /home/$USER/.welcome/welcome.sh##g' $zshrc
tput rc el ed
echo -e "\e[36mUninstalled! \e[0m"
else
tput rc el ed
echo -e "\e[32mCancelled. \e[0m"
fi
fi
else
echo "This script can only be installed in bash or zsh."
fi

View file

@ -52,10 +52,10 @@ battery () {
# Set a default to prevent errors
batlvl=0
if [ -a /sys/class/power_supply/BAT0/capacity ];
if [[ -a "/sys/class/power_supply/BAT0/capacity" ]];
then
batlvl=$(cat /sys/class/power_supply/BAT0/capacity)
elif [ -a /sys/class/power_supply/BAT1/capacity ];
elif [[ -a "/sys/class/power_supply/BAT1/capacity" ]];
then
batlvl=$(cat /sys/class/power_supply/BAT1/capacity)
fi
@ -69,7 +69,7 @@ battery () {
if [ $batlvl -le 15 ];
then
echo -en "${CRIT}$batlvl%${NCOL}. "
if [ $rechargenotif == "on" ];
if [ "$rechargenotif" = "on" ];
then
echo -en "- ${NORM}You should probably recharge${NCOL}. "
fi
@ -132,7 +132,7 @@ updates () {
fi
# Check for Flatpak
if command -v flatpak &> /dev/null && [ $flatpakupd == "on" ];
if command -v flatpak &> /dev/null && [ "$flatpakupd" = "on" ];
then
flatpak=$(flatpak remote-ls --updates 2> /dev/null | wc -l)
fi