Bumped version, 1.1.0

install.sh

@@ -1,6 +1,5 @@
-# shellcheck disable=SC2016
-
 getVersion () {
+    local ver
     ver=$(grep version ~/.welcome/welcome.sh 2> /dev/null | sed 's/.*=//')
 
     if [ -z "$ver" ]; then
@@ -11,7 +10,8 @@ getVersion () {
     echo "$ver"
 }
 
-univRead () { # Universal read command for bash and zsh
+# Universal read command for bash and zsh
+univRead () {
     echo -en "$1"
     echo -en "\n[\e[36mY/n\e[0m]"
     if [[ "$environment" = "bash" ]]; then
@@ -22,96 +22,42 @@ univRead () { # Universal read command for bash and zsh
     echo
 }
 
-tput sc
+uninstall () {
-if ! [[ $1 == "auto" ]] && [[ -z "$1" ]]; then
+    # Check if the user actually wishes to uninstall the script
-    echo "Checking for latest release..."
+    univRead "Do you want to \e[31muninstall \e[35mwelcome.sh\e[0m?"
-fi
-
-latestver=$(curl -Ls https://github.com/G2-Games/welcome.sh/releases/latest/download/welcome.sh | grep version | sed 's/.*=//')
-oldver=$(grep version ~/.welcome/welcome.sh 2> /dev/null | sed 's/.*=//' | 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)
-
-# Check if the environment is bash or zsh
-if [[ "$environment" != "bash" ]] && [[ "$environment" != "zsh" ]]; then
-    printf "\e[31;5mERROR:\e[0m \e[31;3mThis script can only be installed in Bash or Zsh.\e[0m\n"
-    exit 0
-fi
-
-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
-    tput rc
-    echo "Welcome! Installing v$version in $environment..."
-    tput sc
-
-    cd ~/ || exit 1
-    mkdir -p ~/.welcome
-    curl -SL https://github.com/G2-Games/welcome.sh/releases/download/v"${version}"/welcome.sh --output ~/.welcome/welcome.sh
-    if [[ $vernum -ge 100 ]]; then
-        curl -SL https://github.com/G2-Games/welcome.sh/releases/download/v"${version}"/config.cfg --output ~/.welcome/config.cfg
-    fi
-    chmod +x ~/.welcome/welcome.sh
-
-
-    if [[ "$environment" = "bash" ]]; then
-        echo "Installing to bashrc"
-        echo 'bash ~/.welcome/welcome.sh' >> $bashrc
-    elif [[ "$environment" = "zsh" ]]; then
-        echo "Installing to zshrc"
-        echo 'zsh ~/.welcome/welcome.sh' >> $zshrc
-    fi
-
-    cd "$originaldir" || exit 1
-    tput rc && tput el && tput ed
-    echo -e "\e[36mInstalled! \e[0m"
-else
-    tput rc
-    tput sc
-    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"
-    fi
-
-    if [[ $vernum -gt $oldver ]]; then
-
-        # Pull the new configuration version from github
-        newCfgVer=$(curl -Ls https://github.com/G2-Games/welcome.sh/releases/download/v"${version}"/config.cfg | grep version | cut -d= -f2)
-
-        univRead "Do you want to \e[36mupdate \e[35mwelcome.sh\e[0m? (\e[36mv$(getVersion)\e[0m => \e[32mv$version\e[0m)"
     if ! [[ $REPLY =~ ^[Yy]$ ]]; then
-            tput rc && tput el && tput ed
+        tput rc el ed
-            echo -e "\e[31mCancelled"
+        echo -e "\e[31mUninstall cancelled.\e[0m"
-            if [[ $1 != "auto" ]]; then
-                echo -e "\e[35mwelcome.sh\e[0m already installed!"
-            fi
         exit 0
     fi
 
-        if [[ $newCfgVer -gt $(grep version ~/.welcome/config.cfg 2> /dev/null | cut -d= -f2) ]]; then
+    tput rc el ed
-            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."
+    echo "Goodbye. Uninstalling..."
-            if [[ $REPLY =~ ^[Yy]$ ]]; then
+    tput sc
-                overcfg=1
+    rm ~/.welcome/welcome.sh 2> /dev/null
-            fi
+    rm ~/.welcome/config.cfg 2> /dev/null
-        elif [[ $oldver -lt 100 ]]; then
+    rm ~/.welcome/config_old.cfg 2> /dev/null
-            overcfg=1
+    rm -r ~/.welcome
-        else
+
-            overcfg=0
+    #remove all lines that match the string
-        fi
+    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
@@ -139,40 +85,115 @@ else
     done
     echo 'zsh ~/.welcome/welcome.sh' >> $zshrc
 
-        tput rc && tput el && tput ed
+    tput rc el ed
     echo -e "\e[32mUpdated to v$version! \e[0m"
-        exit 0
+}
-    fi
 
-    # 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 && tput el && tput ed
-        echo -e "\e[31mCancelled. \e[0m"
-        exit 0
-    fi
-
-    tput rc && tput el && tput ed
-    echo "Goodbye. Uninstalling..."
 tput sc
-    rm ~/.welcome/welcome.sh 2> /dev/null
+if [[ -z "$1" ]] && [[ $1 != "auto" ]]; then
-    rm ~/.welcome/config.cfg 2> /dev/null
+    echo "Checking for latest release..."
-    rm ~/.welcome/config_old.cfg 2> /dev/null
+fi
-    rm -r ~/.welcome
+
-
+if ! [[ $(command -v curl) ]]; then
-    #remove all lines that match the string
+    exit 1
-    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')
+fi
-    lines=$(printf '%s\n' "$lines" | sed '1!G;h;$!d' | sed ':a;N;$!ba;s/\n/ /g')
+
-    for i in $lines; do
+latestver=$(curl -Ls https://github.com/G2-Games/welcome.sh/releases/latest/download/welcome.sh | grep version | cut -d= -f2)
-        sed "${i}d" $bashrc > file.tmp && mv file.tmp $bashrc
+oldver=$(grep version ~/.welcome/welcome.sh 2> /dev/null | cut -d= -f2 | sed 's/[.][.]*//g') && if [[ -z "$oldver" ]]; then oldver=0; fi
-    done
+
-
+version="${1:-$latestver}"
-    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')
+if [[ $1 == "auto" ]] && [[ ${latestver//./} -le $oldver ]]; then
-    for i in $lines; do
+    exit 0
-        sed "${i}d" $zshrc > file.tmp && mv file.tmp $zshrc
+elif [[ $1 == "auto" ]]; then
-    done
+    version=$latestver
-
+fi
-    tput rc && tput el && tput ed
+
-    echo -e "\e[36mUninstalled! \e[0m"
+vernum=${version//./}
+bashrc=~/.bashrc
+zshrc=~/.zshrc
+originaldir=$PWD
+environment=$(ps -o args= -p $$ | grep -Em 1 -o '\w{0,5}sh' | head -1)
+
+# 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...====#
+
+    tput rc
+    echo "Welcome! Installing v$version in $environment..."
+    tput sc
+
+    cd ~/ || exit 1
+    mkdir -p ~/.welcome
+    curl -SL https://github.com/G2-Games/welcome.sh/releases/download/v"${version}"/welcome.sh --output ~/.welcome/welcome.sh
+    if [[ $vernum -ge 100 ]]; then
+        curl -SL https://github.com/G2-Games/welcome.sh/releases/download/v"${version}"/config.cfg --output ~/.welcome/config.cfg
+    fi
+    chmod +x ~/.welcome/welcome.sh
+
+    if [[ "$environment" = "bash" ]]; then
+        echo "Installing to bashrc"
+        echo 'bash ~/.welcome/welcome.sh' >> $bashrc
+    elif [[ "$environment" = "zsh" ]]; then
+        echo "Installing to zshrc"
+        echo 'zsh ~/.welcome/welcome.sh' >> $zshrc
+    fi
+
+    cd "$originaldir" || exit 1
+    tput rc el ed
+    echo -e "\e[36mInstalled! \e[0m"
+else
+    #==== Execute if already installed...====#
+
+    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"
+    fi
+
+    if [[ $vernum -gt $oldver ]]; then
+        # Pull the new configuration version from github
+        newCfgVer=$(curl -Ls https://github.com/G2-Games/welcome.sh/releases/download/v"${version}"/config.cfg | grep version | cut -d= -f2)
+
+        univRead "Do you want to \e[36mupdate \e[35mwelcome.sh\e[0m? (\e[36mv$(getVersion)\e[0m => \e[32mv$version\e[0m)"
+        if ! [[ $REPLY =~ ^[Yy]$ ]]; then
+            tput rc sc el ed
+            echo -e "\e[31mUpdate cancelled.\e[0m"
+            update=0
+        else
+            update=1
+        fi
+
+        if [[ $newCfgVer -gt $(grep version ~/.welcome/config.cfg 2> /dev/null | cut -d= -f2) ]]; then
+            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."
+            if [[ $REPLY =~ ^[Yy]$ ]]; then
+                overcfg=1
+            fi
+        elif [[ $oldver -lt 100 ]]; then
+            overcfg=1
+        else
+            overcfg=0
+        fi
+    fi
+
+    if [[ update -gt 0 ]]; then
+        update
+        exit 0
+    fi
+
+    if ! [[ $1 == "auto" ]]; then
+        uninstall
+        exit 0
+    fi
 fi

welcome.sh

@@ -2,11 +2,17 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-version=1.0.5
 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.0
+
 #========Welcome=======#
 welcome () {
   msg="Welcome" # Default
+  greetingsLength=${#greetings[@]}
+  greetingsNumber=$((RANDOM % greetingsLength))
 
   if command -v whoami &>/dev/null ; then
     usr=$(whoami)
@@ -17,7 +23,7 @@ welcome () {
   fi
 
   if [ "$randgreeting" = "on" ]; then
-    msg=${greetings[$(($RANDOM % $(echo ${#greetings[@]})))]}
+    msg=${greetings[$greetingsNumber]}
   fi
 
   # Print the welcome message
@@ -29,7 +35,7 @@ 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)"
@@ -56,13 +62,13 @@ greeting () {
   fi
 
   # Change color and greeting depending on the segment of day
-  if [ $hour -le 11 ] && [ $hour -gt 6 ]; then
+  if [ "$hour" -le 11 ] && [ "$hour" -gt 6 ]; then
     echo -en "$greet ${MORN}morning${NCOL}. "
-  elif [ $hour -eq 12 ]; then
+  elif [ "$hour" -eq 12 ]; then
     echo -en "It's ${AFTN}noon${NCOL}. "
-  elif [ $hour -le 17 ] && [ $hour -gt 12 ]; then
+  elif [ "$hour" -le 17 ] && [ "$hour" -gt 12 ]; then
     echo -en "$greet ${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}. "
   else
     echo -en "It's ${NIGH}night${NCOL}. "
@@ -87,13 +93,13 @@ battery () {
   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
@@ -151,24 +157,25 @@ updates () {
     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 + $brew))
+    updates=$((debian + arch + fedora + flatpak + brew))
     echo $updates >| ~/.welcome/updates
-    pkill -P $pid sleep # When update checking is finished, kill the sleep function running under this bash process
+    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=$(echo $$) # Grab the PID of the process
+  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=$(echo $?)
+  chk=$?
   exec 2>&3       # And then re-enable it
   exec 3>&-
   set -e          # Return to disallowing nonzero exit status
@@ -182,9 +189,9 @@ updates () {
   if [ $chk -lt 1 ]; then
     echo -en "Update check timed out. "
   else
-    if [ $updates -eq 0 ]; then
+    if [ "${updates}" -eq 0 ]; then
       echo -en "You have no pending updates. "
-    elif [ $updates -eq 1 ]; then
+    elif [ "${updates}" -eq 1 ]; then
       echo -en "You have ${NORM}1${NCOL} pending update. "
     else
       echo -en "You have ~${NORM}$updates${NCOL} pending updates. "
@@ -199,12 +206,12 @@ 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 ]; do
-    cr=$((0 + $RANDOM % 255))
+    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))
@@ -251,7 +258,9 @@ welcome
 greeting
 clock
 battery
-if [ "$updatecheck" = "on" ];then updates; fi
+if [ "$updatecheck" = "on" ]; then
+  updates
+fi
 echo # Properly line break at the end
 
 set +e
@@ -260,14 +269,13 @@ date=$(date +%s)
 lastdate=$(cat ~/.welcome/udm 2>/dev/null)
 
 if [[ $((date - lastdate)) -ge 86400 ]]; then
-  environment=$(ps -o args= -p $$ | grep -Em 1 -o '\w{0,5}sh' | head -1)
   if [[ "$environment" = "bash" ]]; then
     bash install.sh auto
   elif [[ "$environment" = "zsh" ]]; then
     zsh install.sh auto
   fi
-  echo $(date +%s) >| ~/.welcome/udm 2>/dev/null
+  date +%s >| ~/.welcome/udm 2>/dev/null
 elif ! [[ -f ~/.welcome/udm ]]; then
   touch ~/.welcome/udm
-  echo $(date +%s) >| ~/.welcome/udm 2>/dev/null
+  date +%s >| ~/.welcome/udm 2>/dev/null
 fi