README.md

@@ -1,5 +1,5 @@
 # welcome.sh
-![image](https://user-images.githubusercontent.com/72430668/190891298-c08c8ad8-9270-4549-b3ae-85e48ae2748b.png)
+<img src="https://user-images.githubusercontent.com/72430668/188546505-13b5627f-6e11-41f2-809b-5992f24aa25b.png">
 
 ### A nice welcome script for Bash and Zsh
 This is a nice little script for your `.bashrc` or `.zshrc` that greets you on every launch, with some helpful (and customizable!) information.
@@ -10,19 +10,10 @@ My goal with this script is to keep it simple, just a single line that gives use
 - Relatively fast
 - <span title="Please let me know of other things to support!">Works across many distros (update checking support)</span>
 - Clean and simple
-- Customizable
-- Easy to install and update
-
-#### Requirements:
-- Terminal with 24-bit true color support
-  - Can check with `printf "\x1b[38;2;255;100;0mTRUECOLOR\x1b[0m\n"`, will return `TRUECOLOR` in Brown if supported<br>
-  <sup>Source: [https://github.com/termstandard/colors](https://github.com/termstandard/colors)</sup>
-  - [List of supported terminal emulators](https://github.com/termstandard/colors#truecolor-support-in-output-devices)
-- A modern version of Bash or Zsh (eg. the `/bin/sh` shell in Ubuntu does **not** work)
 <hr>
 
 ### Installing:
-#### Automatic Installation via Curl
+#### Via Curl
 <sub>Bash:</sub>
 ```
 bash -c "$(curl -s https://raw.githubusercontent.com/G2-Games/welcome.sh/main/install.sh)"
@@ -31,66 +22,59 @@ bash -c "$(curl -s https://raw.githubusercontent.com/G2-Games/welcome.sh/main/in
 ```
 zsh -c "$(curl -s https://raw.githubusercontent.com/G2-Games/welcome.sh/main/install.sh)"
 ```
+#### Or wget
+<sub>Bash:</sub>
+```
+bash -c "$(wget -q https://raw.githubusercontent.com/G2-Games/welcome.sh/main/install.sh -O -)"
+```
+<sub>Zsh:</sub>
+```
+zsh -c "$(wget -q https://raw.githubusercontent.com/G2-Games/welcome.sh/main/install.sh -O -)"
+```
 
 It installs to `~/.welcome/welcome.sh`, and adds a line to the bottom of `~/.bashrc` or `~/.zshrc`
 
+Run again to uninstall. Uninstalling will remove it from both Bash and Zsh.
+
 #### Manual Installation
-To install it manually, download the latest `welcome.sh` from <a href="https://github.com/G2-Games/welcome.sh/releases/latest">releases</a> and place it in your home directory. Then add `bash ~/welcome.sh` to your `.bashrc`. It works without the config file, but you can also add that to your home directory for easier manual updates.
+To use it, download `welcome.sh` and place it in your home directory. Then add `/home/$USER/welcome.sh` to your `.bashrc`.
 
 ### Updating:
-Run the script again to check for an update. If you have an older version it will prompt you. You can update **from** any version **to** any newer version. The proper files will be downloaded as necessary.
+WIP
 
+Currently you can update by uninstalling and reinstalling, but this wipes all settings. I am working on making a better way to do this.
 <hr>
 
 ### Configs:
-To configure settings, open `~/.welcome/config.cfg` in your text editor of choice. There, you'll find a few settings:
+To configure settings, open `welcome.sh` in your text editor of choice and go to the bottom. There, you'll find a few settings:
 
 ```bash
-#==================SETUP=================#
+#=========SETUP========#
 # Select which parts you want active by  #
 # commenting them out. For example, on a #
 # desktop, disabling the battery message #
 # is a good idea. You can also re-order  #
 # them to change how they display!       #
-#========================================#
 
-greetings=("Welcome" "Greetings" "Hello" "Hi") # Add your own greetings!
 randgreeting="off"  #< Turn the random greetings on (eg. "Hello <user>, Hi <user>")
-twelvehour="on"     #< Switch between 12 and 24 hour time (eg. 8:00 PM vs 20:00)
+twelvehour="on"     #< Switch between 12 and 24 hour time (eg. 8:00pm vs 20:00)
 rechargenotif="off" #< Notify that you should recharge if below 15%
-updatecheck="on"    #< Check for all updates, slows startup a bit
 flatpakupd="off"    #< Check for flatpak updates, this slows startup down A LOT
-goodgreeting="on"   #< Display greetings like "Good afternoon," else "It's afternoon"
-displaydate="off"   #< Unused so far
 
-#=========COLORS=======#
+welcome
-NCOL='\e[0m'
+greeting
-BOLD='\e[1m'
+clock
-ITAL='\e[3m'
+battery
-UNDR='\e[4m'
+updates #< This makes startup slower
-BLNK='\e[5m'
+echo # Properly line break at the end
-
-# Battery level colors
-CRIT='\e[31m'
-LOW='\e[33m'
-NORM='\e[32m'
-FULL='\e[3;4;92m'
-
-TIME='\e[38;2;224;146;252;1m' # Clock color
-DATE='\e[38;2;50;168;82;1m'   # Future "Date" item color
-USRC=$(randcolor)             # Username color
-
-# Greeting colors
-NIGH='\e[38;2;200;107;209m'
-MORN='\e[38;2;255;164;74m'
-AFTN='\e[38;2;250;245;110m'
-EVEN='\e[38;2;171;54;3m'
-
-cfgversion=2
 ```
+
+Here, you can re-arrange the modules, and turn off and on flatpak and recharge notifications. I recommend leaving flatpak off as it makes startup incredibly slow. 
+
+I'm planning on making this config section a separate file later to make changing settings easier and updating easier.
 <hr>
 
 ### TODO:
+- [x] Add easier way to install and update
 - [ ] Fix issues across other distros
-- [ ] Add new features? (Please suggest!)
+- [ ] Add new features?
-- [ ] Improve MacOS functionality

cleanup.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-version=1
-
-echo "Ensuring welcome.sh is installed in the new location..."
-
-# Check if welcome.sh is installed in the old location
-if [[ -f ~/.welcome ]]\
-    || [[ -f ~/.welcome/welcome.sh ]]\
-    || [[ -f ~/.welcome/config.cfg ]];
-then
-    # Modify the files with proper paths
-    sed "${i}d" "$zshrc" > file.tmp && mv file.tmp "$zshrc"
-
-    # Create the directories in the proper spots
-    mkdir -p ~/.config/welcome.sh/
-    mkdir -p ~/.local/bin/
-
-    # Move the welcome files to the proper folders
-    mv ~/.welcome/config.cfg ~/.config/welcome.sh/config.cfg
-    mv ~/.welcome/welcome.sh ~/.local/bin/welcome.sh
-
-    echo "welcome.sh is now installed in the new location!"
-else
-    echo "welcome.sh is already installed properly!"
-fi

config.cfg

@@ -1,41 +0,0 @@
-#==================SETUP=================#
-# Select which parts you want active by  #
-# commenting them out. For example, on a #
-# desktop, disabling the battery message #
-# is a good idea. You can also re-order  #
-# them to change how they display!       #
-#========================================#
-
-greetings=("Welcome" "Greetings" "Hello" "Hi") # Add your own greetings!
-randgreeting="off"  #< Turn the random greetings on (eg. "Hello <user>, Hi <user>")
-twelvehour="on"     #< Switch between 12 and 24 hour time (eg. 8:00 PM vs 20:00)
-rechargenotif="off" #< Notify that you should recharge if below 15%
-updatecheck="on"    #< Check for all updates, slows startup a bit
-flatpakupd="off"    #< Check for flatpak updates, this slows startup down A LOT
-goodgreeting="on"   #< Display greetings like "Good afternoon," else "It's afternoon"
-displaydate="off"   #< Unused so far
-
-#=========COLORS=======#
-NCOL='\e[0m'
-BOLD='\e[1m'
-ITAL='\e[3m'
-UNDR='\e[4m'
-BLNK='\e[5m'
-
-# Battery level colors
-CRIT='\e[31m'
-LOW='\e[33m'
-NORM='\e[32m'
-FULL='\e[3;4;92m'
-
-TIME='\e[38;2;224;146;252;1m' # Clock color
-DATE='\e[38;2;50;168;82;1m'   # Future "Date" item color
-USRC=$(randcolor)             # Username color
-
-# Greeting colors
-NIGH='\e[38;2;200;107;209m'
-MORN='\e[38;2;255;164;74m'
-AFTN='\e[38;2;250;245;110m'
-EVEN='\e[38;2;171;54;3m'
-
-cfgversion=2

install.sh

@@ -1,207 +1,77 @@
-getVersion () {
+version=0.2.4
-    local ver
+bashrc="/home/$USER/.bashrc"
-    ver=$(grep version ~/.welcome/welcome.sh 2> /dev/null | sed 's/.*=//')
+zshrc="/home/$USER/.zshrc"
-
-    if [ -z "$ver" ]; then
-        echo -e "\bUnknown"
-        return
-    fi
-
-    echo "$ver"
-}
-
-# Universal read command for bash and zsh
-univRead () {
-    echo -en "$1"
-    echo -en "\n[\e[36mY/n\e[0m]"
-    if [[ "$environment" = "bash" ]]; then
-        read -p " " -r
-    elif [[ "$environment" = "zsh" ]]; then
-        read -q "REPLY? " -r
-    fi
-    echo
-}
-
-uninstall () {
-    # Check if the user actually wishes to uninstall the script
-    univRead "Do you want to \e[31muninstall \e[35mwelcome.sh\e[0m?"
-    if ! [[ $REPLY =~ ^[Yy]$ ]]; then
-        tput rc el ed
-        echo -e "\e[31mUninstall cancelled.\e[0m"
-        exit 0
-    fi
-
-    tput rc el ed
-    echo "Goodbye. Uninstalling..."
-    tput sc
-    rm ~/.welcome/welcome.sh 2> /dev/null
-    rm ~/.welcome/install.sh 2> /dev/null
-    rm ~/.welcome/config.cfg 2> /dev/null
-    rm ~/.welcome/config_old.cfg 2> /dev/null
-    rm -r ~/.welcome
-
-    #remove all lines that match the string
-    lines=$(grep -sn 'bash ~/.welcome/welcome.sh' "$bashrc" | sed -e 's/:.*//g' && grep -sn 'bash /home/$USER/.welcome/welcome.sh' "$bashrc" | sed -e 's/:.*//g')
-    lines=$(printf '%s\n' "$lines" | sed '1!G;h;$!d' | sed ':a;N;$!ba;s/\n/ /g')
-    for i in $lines; do
-        sed "${i}d" "$bashrc" > file.tmp && mv file.tmp "$bashrc"
-    done
-
-    lines=$(grep -sn 'zsh ~/.welcome/welcome.sh' "$zshrc" | sed -e 's/:.*//g' && grep -sn 'zsh /home/$USER/.welcome/welcome.sh' "$zshrc" | sed -e 's/:.*//g')
-    lines=$(printf '%s\n' "$lines" | sed '1!G;h;$!d' | sed ':a;N;$!ba;s/\n/ /g')
-    for i in $lines; do
-        sed "${i}d" "$zshrc" > file.tmp && mv file.tmp "$zshrc"
-    done
-
-    tput rc && tput el && tput ed
-    echo -e "\e[36mUninstalled! \e[0m"
-}
-
-update () {
-    tput rc el ed
-    echo "Updating..."
-    tput sc
-    mkdir -p ~/.welcome
-    rm ~/.welcome/welcome.sh 2> /dev/null
-    rm ~/.welcome/install.sh 2> /dev/null
-
-    curl -SL https://github.com/G2-Games/welcome.sh/releases/download/v"${version}"/welcome.sh --output ~/.welcome/welcome.sh
-    curl -SL https://raw.githubusercontent.com/G2-Games/welcome.sh/main/install.sh --output ~/.welcome/install.sh
-    if [[ $vernum -ge 100 ]] && [[ $overcfg -gt 0 ]]; then
-        echo "Backing up: config.cfg >> config_old.cfg"
-        mv ~/.welcome/config.cfg ~/.welcome/config_old.cfg
-        curl -SL https://github.com/G2-Games/welcome.sh/releases/download/v"${version}"/config.cfg --output ~/.welcome/config.cfg
-    fi
-
-    # Check for older versions and replace bashrc lines
-    lines=$(grep -sn 'bash ~/.welcome/welcome.sh' "$bashrc" | sed -e 's/:.*//g' && grep -sn 'bash /home/$USER/.welcome/welcome.sh' "$bashrc" | sed -e 's/:.*//g') # Find target line number
-    lines=$(printf '%s\n' "$lines" | sed '1!G;h;$!d' | sed ':a;N;$!ba;s/\n/ /g') # Format the line number properly (macos doesn't have Cut)
-    for i in $lines; do
-        sed "${i}d" "$bashrc" > file.tmp && mv file.tmp "$bashrc"
-    done
-    echo 'bash ~/.welcome/welcome.sh' >> "$bashrc"
-
-    lines=$(grep -sn 'zsh ~/.welcome/welcome.sh' "$zshrc" | sed -e 's/:.*//g' && grep -sn 'zsh /home/$USER/.welcome/welcome.sh' "$zshrc" | sed -e 's/:.*//g')
-    lines=$(printf '%s\n' "$lines" | sed '1!G;h;$!d' | sed ':a;N;$!ba;s/\n/ /g')
-    for i in $lines; do
-        sed "${i}d" "$zshrc" > file.tmp && mv file.tmp "$zshrc"
-    done
-    echo 'zsh ~/.welcome/welcome.sh' >> "$zshrc"
-
-    tput rc el ed
-    echo -e "\e[32mUpdated to v$version! \e[0m"
-}
-
-tput sc
-if [[ -z "$1" ]] && [[ $1 != "auto" ]]; then
-    echo "Checking for latest release..."
-fi
-
-if ! [[ $(command -v curl) ]]; then
-    exit 1
-fi
-
-latestver=$(curl -Ls https://github.com/G2-Games/welcome.sh/releases/latest/download/welcome.sh | grep version | cut -d= -f2)
-oldver=$(grep version ~/.welcome/welcome.sh 2> /dev/null | cut -d= -f2 | sed 's/[.][.]*//g') && if [[ -z "$oldver" ]]; then oldver=0; fi
-
-version="${1:-$latestver}"
-
-if [[ $1 == "auto" ]] && [[ ${latestver//./} -le $oldver ]]; then
-    exit 0
-elif [[ $1 == "auto" ]]; then
-    version=$latestver
-fi
-
-vernum=${version//./}
-bashrc=~/.bashrc
-zshrc=~/.zshrc
 originaldir=$PWD
-environment=$(ps -o args= -p $$ | grep -Em 1 -o '\w{0,5}sh' | head -1)
+environment=$(readlink /proc/$$/exe | grep -o 'bash\|zsh')
-
+if [[ "$environment" = "bash" ]] || [[ "$environment" = "zsh" ]];
-# Check if the environment is bash or zsh
-if [[ "$environment" != "bash" ]] && [[ "$environment" != "zsh" ]]; then
-    tput rc
-    printf "\e[31;5mERROR:\e[0m \e[31;3mThis script can only be installed in Bash or Zsh.\e[0m\n"
-    printf "\e[32mYou appear to be using %s, which is not a valid shell for\n\
-this script!\e[0m Please use \e[3mBash \e[0mor \e[3mZsh.\e[0m\n" "${environment}"
-    exit 1
-fi
-
-# Check if already installed
-if  ! grep -qs 'bash ~/.welcome/welcome.sh' $bashrc &&
-    ! grep -qs 'zsh ~/.welcome/welcome.sh' $zshrc &&
-    ! grep -qs 'bash /home/$USER/.welcome/welcome.sh' $bashrc &&
-    ! grep -qs 'zsh /home/$USER/.welcome/welcome.sh' $zshrc;
 then
-    #==== Execute if first time installing...====#
+    if ! grep -q 'bash /home/$USER/.welcome/welcome.sh' $bashrc && ! grep -q 'zsh /home/$USER/.welcome/welcome.sh' $zshrc;
-    tput rc
+    then
-    echo "Welcome! Installing v$version in $environment..."
+        echo "Welcome! Installing..."
-    tput sc
+        tput sc
-
+        cd /home/$USER
-    cd ~/ || exit 1
+        mkdir -p /home/$USER/.welcome
-    mkdir -p ~/.welcome
+        if which curl >/dev/null ;
-    curl -SL https://github.com/G2-Games/welcome.sh/releases/download/v"${version}"/welcome.sh --output ~/.welcome/welcome.sh
+        then
-    curl -SL https://raw.githubusercontent.com/G2-Games/welcome.sh/main/install.sh --output ~/.welcome/install.sh
+            curl -SL https://github.com/G2-Games/welcome.sh/releases/download/v${version}/welcome.sh --output /home/$USER/.welcome/welcome.sh
-
+        elif which wget >/dev/null ;
-    if [[ $vernum -ge 100 ]]; then
+        then
-        curl -SL https://github.com/G2-Games/welcome.sh/releases/download/v"${version}"/config.cfg --output ~/.welcome/config.cfg
+            wget https://github.com/G2-Games/welcome.sh/releases/download/v${version}/welcome.sh --P /home/$USER/.welcome/
-    fi
+        else
-    chmod +x ~/.welcome/welcome.sh
+            echo "Cannot download, neither wget nor curl is available."
-
+            exit 1
-    if [[ "$environment" = "bash" ]]; then
+        fi
-        echo "Installing to bashrc"
+        chmod +x /home/$USER/.welcome/welcome.sh
-        echo 'bash ~/.welcome/welcome.sh' >> $bashrc
+        if [[ "$environment" = "bash" ]];
-    elif [[ "$environment" = "zsh" ]]; then
+        then
-        echo "Installing to zshrc"
+            echo 'bash /home/$USER/.welcome/welcome.sh' >> $bashrc
-        echo 'zsh ~/.welcome/welcome.sh' >> $zshrc
+            echo "Installing to bashrc"
-    fi
+        elif [[ "$environment" = "zsh" ]];
-
+        then
-    cd "$originaldir" || exit 1
+            echo 'zsh /home/$USER/.welcome/welcome.sh' >> $zshrc
-    tput rc el ed
+            echo "Installing to zshrc"
-    echo -e "\e[36mInstalled! \e[0m"
+        fi
-else
+        cd "$originaldir"
-    #==== Execute if already installed...====#
+        tput rc el ed
-
+        echo -e "\e[36mInstalled! \e[0m"
-    tput rc sc el ed
-    mkdir -p ~/.welcome
-    if ! [[ $1 == "auto" ]]; then
-        echo -e "\e[35mwelcome.sh\e[0m already installed!"
     else
-        echo -e "\e[32mUpdate available for \e[35mwelcome.sh!\e[0m"
+        tput sc
-    fi
+        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 [[ $vernum -gt $oldver ]]; then
+        if [[ "$environment" = "bash" ]]
-        # Pull the new configuration version from github
+        then
-        newCfgVer=$(curl -Ls https://github.com/G2-Games/welcome.sh/releases/download/v"${version}"/config.cfg | grep version | cut -d= -f2)
+            read -p " " -n 1 -r
-
+        elif [[ "$environment" = "zsh" ]]
-        univRead "Do you want to \e[36mupdate \e[35mwelcome.sh\e[0m? (\e[36mv$(getVersion)\e[0m => \e[32mv$version\e[0m)"
+        then
-        if ! [[ $REPLY =~ ^[Yy]$ ]]; then
+            read -q "REPLY? " -n 1 -r
-            tput rc sc el ed
-            echo -e "\e[31mUpdate cancelled.\e[0m"
-            update=0
-        else
-            update=1
         fi
-
+        echo
-        if [[ $newCfgVer -gt $(grep version ~/.welcome/config.cfg 2> /dev/null | cut -d= -f2) ]]; then
+        if [[ $REPLY =~ ^[Yy]$ ]]
-            univRead "Newer \e[36mconfig\e[0m version available. Do you want to \e[31moverwrite\e[0m your \e[36mconfig\e[0m? \nA backup will be created in the \e[36m.welcome\e[0m folder."
+        then
-            if [[ $REPLY =~ ^[Yy]$ ]]; then
+            tput rc el ed
-                overcfg=1
+            echo "Goodbye. Uninstalling..."
+            tput sc
+            rm /home/$USER/.welcome/welcome.sh
+            rmdir /home/$USER/.welcome
+            if grep -n 'bash /home/$USER/.welcome/welcome.sh' $bashrc ;
+            then
+                line=$(grep -n 'bash /home/$USER/.welcome/welcome.sh' $bashrc)
+                line=${line%:*}
+                sed -i "${line}d" $bashrc
             fi
-        elif [[ $oldver -lt 100 ]]; then
+            if grep -n 'zsh /home/$USER/.welcome/welcome.sh' $zshrc ;
-            overcfg=1
+            then
+                line=$(grep -n 'zsh /home/$USER/.welcome/welcome.sh' $zshrc)
+                line=${line%:*}
+                sed -i "${line}d" $zshrc
+            fi
+            tput rc el ed
+            echo -e "\e[36mUninstalled! \e[0m"
         else
-            overcfg=0
+            tput rc el ed
+            echo -e "\e[32mCancelled. \e[0m"
         fi
     fi
-
+else
-    if [[ update -gt 0 ]]; then
+    printf "\e[31;5mERROR:\e[0m \e[31;3mThis script can only be installed in Bash or Zsh.\e[0m\n"
-        update
-        exit 0
-    fi
-
-    if ! [[ $1 == "auto" ]]; then
-        uninstall
-        exit 0
-    fi
 fi

welcome.sh

@@ -1,37 +1,20 @@
-export LC_NUMERIC="en_US.UTF-8" &> /dev/null #Fix for locales that use , instead of . as a decimal delimiter
-
-# Define "global" variables
-environment=$(ps -o args= -p $$ | grep -Em 1 -o '\w{0,5}sh' | head -1)
-version=1.1.2
-
 #========Welcome=======#
 welcome () {
   msg="Welcome" # Default
-  greetingsLength=${#greetings[@]}
-  greetingsNumber=$((RANDOM % greetingsLength))
-
-  if command -v whoami &>/dev/null ; then
-    usr=$(whoami)
-  elif command -v id &>/dev/null; then
-    usr=$(id -u -n)
-  else
-    usr=$USER
-  fi
-
   if [ "$randgreeting" = "on" ]; then
-    msg=${greetings[@]:$greetingsNumber:1}
+    greetings=("Welcome" "Greetings" "Hello" "Hi") # Add your own greetings!
+    msg=${greetings[$(($RANDOM % $(echo ${#greetings[@]})))]}
   fi
 
   # Print the welcome message
-  echo -en "$msg, ${USRC}${BOLD}$usr${NCOL}. "
+  echo -en "$msg, ${USRC}${BOLD}$USER${NCOL}. "
 }
 
 #=========Time=========#
 clock () {
-  bksp=""
   # Set the current hour and minute
   if [ "$twelvehour" = "on" ]; then
-    if [[ "$(date +%_I)" -lt 10 ]]; then
+    if [ $(date +%_I) -lt 10 ]; then
       hour="\b$(date +%_I)"
     else
       hour="$(date +%_I)"
@@ -39,7 +22,7 @@ clock () {
     ampm=$(date +%p)
   else
     hour=$(date +%H)
-    bksp="\b \b" # This is a hack to fix some spacing issues with AM and PM with different lengths of time
+    bksp="\b \b"
   fi
   minute=$(date +%M)
 
@@ -51,21 +34,15 @@ clock () {
 greeting () {
   # Set the hour
   hour=$(date +%H)
-  greet="It's"
 
-  if [ "$goodgreeting" = "on" ]; then
+  if [ $hour -le 11 ] && [ $hour -gt 6 ]; then
-    greet="Good"
+    echo -en "It's ${MORN}morning${NCOL}. "
-  fi
+  elif [ $hour -eq 12 ]; then
-
-  # Change color and greeting depending on the segment of day
-  if [ "$hour" -le 11 ] && [ "$hour" -gt 6 ]; then
-    echo -en "$greet ${MORN}morning${NCOL}. "
-  elif [ "$hour" -eq 12 ]; then
     echo -en "It's ${AFTN}noon${NCOL}. "
-  elif [ "$hour" -le 17 ] && [ "$hour" -gt 12 ]; then
+  elif [ $hour -le 16 ] && [ $hour -gt 12 ]; then
-    echo -en "$greet ${AFTN}afternoon${NCOL}. "
+    echo -en "It's ${AFTN}afternoon${NCOL}. "
-  elif [ "$hour" -le 19 ] && [ "$hour" -gt 17 ]; then
+  elif [ $hour -le 19 ] && [ $hour -gt 17 ]; then
-    echo -en "$greet ${EVEN}evening${NCOL}. "
+    echo -en "It's ${EVEN}evening${NCOL}. "
   else
     echo -en "It's ${NIGH}night${NCOL}. "
   fi
@@ -77,25 +54,22 @@ battery () {
   # Set a default to prevent errors
   batlvl=0
 
-  # Check the two usually used battery locations
   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" ]]; then
     batlvl=$(cat /sys/class/power_supply/BAT1/capacity)
-  elif command -v pmset &> /dev/null;then
-    batlvl=$(pmset -g batt | grep -Eo "\d+%" | cut -d% -f1)
   else
     batlvl=-1
   fi
 
   # Change color depending on level
-  if [[ $batlvl -ge 100 ]]; then
+  if [ $batlvl -ge 100 ]; then
     echo -en "The battery is ${FULL}fully charged${NCOL}. "
-  elif [[ $batlvl -gt 0 ]]; then
+  elif [ $batlvl -gt 0 ]; then
     echo -en "The battery level is "
-    if [[ $batlvl -le 15 ]]; then
+    if [ $batlvl -le 15 ]; then
       echo -en "${CRIT}$batlvl%${NCOL}. "
-      if [[ "$rechargenotif" = "on" ]]; then
+      if [ "$rechargenotif" = "on" ]; then
         echo -en "- ${NORM}You should probably recharge${NCOL}. "
       fi
     elif [ $batlvl -le 30 ]; then
@@ -112,92 +86,49 @@ updates () {
   debian=0
   arch=0
   fedora=0
-  brew=0
   flatpak=0
-  chk=0
-  updates=0
 
   # Check for updates from different places... wonder if there's a better way
-  updchk () {
-    # Check for APT (Debian based)
-    if command -v apt-get &> /dev/null; then
-      debian=$(apt-get -s dist-upgrade -V | grep -c '=>')
-    fi
 
-    # Check for Arch things
+  # Check for APT
-    if command -v checkupdates &> /dev/null; then
+  if command -v apt &> /dev/null; then
-      arch=$(checkupdates 2> /dev/null | wc -l)
+    debian=$(apt-get -s dist-upgrade -V | grep '=>' | awk '{print$1}' | wc -l)
-    elif command -v yay &> /dev/null; then
-      arch=$(yay -Qu 2> /dev/null | wc -l)
-    elif command -v paru &> /dev/null; then
-      arch=$(paru -Quq 2> /dev/null | wc -l)
-    elif command -v pacman &> /dev/null; then
-      arch=$(pacman -Qu 2> /dev/null | wc -l)
-    fi
-
-    # Check for Fedora things
-    if command -v dnf &> /dev/null; then
-      fedora=$(dnf list updates 2> /dev/null | wc -l)
-      fedora=$((fedora-1))
-    elif command -v yum &> /dev/null; then
-      fedora=$(yum list updates 2> /dev/null | wc -l)
-      fedora=$((fedora-1))
-    fi
-
-    # Check for OpenSUSE things
-    if command -v zypper &> /dev/null; then
-      suse=$(zypper list-updates 2> /dev/null | wc -l)
-      suse=$((suse-4))
-    fi
-
-    # Check for Brew updates
-    if command -v brew &> /dev/null; then
-      brew=$(brew outdated 2> /dev/null | wc -l)
-    fi
-
-    # Check for Flatpak
-    if command -v flatpak &> /dev/null && [ "$flatpakupd" = "on" ]; then
-      flatpak=$(flatpak remote-ls --updates 2> /dev/null | wc -l)
-    fi
-
-    # Add all update counts together
-    updates=$((debian + arch + fedora + suse + flatpak + brew))
-    echo $updates >| ~/.welcome/updates
-    pkill -P "${pid}" sleep # When update checking is finished, kill the sleep function running under this bash process
-    sleep 5
-    if [[ -a ~/.welcome/updates ]]; then
-      rm ~/.welcome/updates
-    fi
-  }
-
-  pid=$$          # Grab the PID of the process
-  updchk &        # Check for updates Asynchronously
-
-  set +e          # Allow nonzero exit status for killing sleep
-  exec 3>&2       # These exec commands simply supress the output of the "kill" command
-  exec 2> /dev/null
-  sleep 5
-  chk=$?
-  exec 2>&3       # And then re-enable it
-  exec 3>&-
-  set -e          # Return to disallowing nonzero exit status
-
-  if [[ -a ~/.welcome/updates ]]; then
-    updates=$(cat ~/.welcome/updates)
-    rm ~/.welcome/updates
   fi
 
+  # Check for different Arch things
+  if command -v yay &> /dev/null; then
+    arch=$(yay -Qu 2> /dev/null | wc -l)
+  elif command -v paru &> /dev/null; then
+    arch=$(paru -Quq 2> /dev/null | wc -l)
+  elif command -v pacman &> /dev/null; then
+    arch=$(pacman -Qu 2> /dev/null | wc -l)
+  fi
+
+  # Check for Fedora things
+  if command -v dnf &> /dev/null; then
+    fedora=$(dnf list updates 2> /dev/null | wc -l)
+    fedora=$((fedora-1))
+  elif command -v yum &> /dev/null; then
+    fedora=$(yum list updates 2> /dev/null | wc -l)
+    fedora=$((fedora-1))
+  fi
+
+  # Check for Flatpak
+  if command -v flatpak &> /dev/null && [ "$flatpakupd" = "on" ]; then
+    flatpak=$(flatpak remote-ls --updates 2> /dev/null | wc -l)
+  fi
+
+
+  # Add all update counts together
+  updates=$(($debian + $arch + fedora + $flatpak))
+
   # Check the update amounts and print them out
-  if [ $chk -lt 1 ]; then
+  if [ $updates -eq 1 ]; then
-    echo -en "Update check timed out. "
+    echo -en "You have ${NORM}1${NCOL} pending update. "
+  elif [ $updates -eq 0 ]; then
+    echo -en "You have no pending updates. "
   else
-    if [ "${updates}" -eq 0 ]; then
+    echo -en "You have ~${NORM}$updates${NCOL} pending updates. "
-      echo -en "You have no pending updates. "
-    elif [ "${updates}" -eq 1 ]; then
-      echo -en "You have ${NORM}1${NCOL} pending update. "
-    else
-      echo -en "You have ~${NORM}$updates${NCOL} pending updates. "
-    fi
   fi
 }
 
@@ -208,12 +139,13 @@ randcolor() {
 # to modify it for a light one                                        #
   cluma=0
   loops=0
-  while [ "$(printf %.0f $cluma)" -le 100 ] && [ $loops -le 10 ]; do
+  while [[ $(printf %.0f $cluma) -le 100 ]] && [[ $loops -le 10 ]];
-    cr=$((0 + RANDOM % 255))
+  do
+    cr=$((0 + $RANDOM % 255))
     crl=$(echo "$cr 0.299" | awk '{print $1 * $2}')
-    cg=$((0 + RANDOM % 255))
+    cg=$((0 + $RANDOM % 255))
     cgl=$(echo "$cg 0.587" | awk '{print $1 * $2}')
-    cb=$((0 + RANDOM % 255))
+    cb=$((0 + $RANDOM % 255))
     cbl=$(echo "$cb 0.114" | awk '{print $1 * $2}')
     cluma=$(echo "$crl $cgl $cbl" | awk '{print $1 + $2 + $3}')
     loops=$((loops+1))
@@ -235,7 +167,6 @@ NORM='\e[32m'
 FULL='\e[3;4;92m'
 
 TIME='\e[38;2;224;146;252;1m' # Clock color
-DATE='\e[38;2;50;168;82;1m'
 USRC=$(randcolor) # <-----------Username color
 
 # Greeting colors
@@ -244,40 +175,21 @@ MORN='\e[38;2;255;164;74m'
 AFTN='\e[38;2;250;245;110m'
 EVEN='\e[38;2;171;54;3m'
 
-greetings=("Welcome" "Greetings" "Hello" "Hi") # Add your own greetings!
+#=========SETUP========#
+# Select which parts you want active by  #
+# commenting them out. For example, on a #
+# desktop, disabling the battery message #
+# is a good idea. You can also re-order  #
+# them to change how they display!       #
+
 randgreeting="off"  #< Turn the random greetings on (eg. "Hello <user>, Hi <user>")
-twelvehour="on"     #< Switch between 12 and 24 hour time (eg. 8:00 PM vs 20:00)
+twelvehour="on"     #< Switch between 12 and 24 hour time (eg. 8:00pm vs 20:00)
 rechargenotif="off" #< Notify that you should recharge if below 15%
-updatecheck="on"    #< Check for general updates
 flatpakupd="off"    #< Check for flatpak updates, this slows startup down A LOT
-goodgreeting="on"   #< Display greetings like "Good afternoon," else "It's afternoon"
-
-# ALL the stuff above this line and below the colors line is in the config, changing it here will do nothing only if the config doesn't exist!
-
-source ~/.welcome/config.cfg
 
 welcome
 greeting
 clock
 battery
-if [ "$updatecheck" = "on" ]; then
+updates
-  updates
-fi
 echo # Properly line break at the end
-
-set +e
-
-date=$(date +%s)
-lastdate=$(cat ~/.welcome/udm 2>/dev/null)
-
-if [[ $((date - lastdate)) -ge 86400 ]]; then
-  if [[ "$environment" = "bash" ]]; then
-    bash ~/.welcome/install.sh auto
-  elif [[ "$environment" = "zsh" ]]; then
-    zsh ~/.welcome/install.sh auto
-  fi
-  date +%s >| ~/.welcome/udm 2>/dev/null
-elif ! [[ -f ~/.welcome/udm ]]; then
-  touch ~/.welcome/udm
-  date +%s >| ~/.welcome/udm 2>/dev/null
-fi