Final cleanup for all things /tools/center related (I hope...)

Update center Shortened and Optimized the /tools/center file Made more changes to the /tools/center file to make it function correctly and made its use cleaner in other files.
2025-12-05 19:06:37 -06:00 · 2022-02-01 10:16:41 -06:00
parent a9c20eca2e
commit 1fede89ec8
7 changed files with 69 additions and 134 deletions
--- a/Launch.sh
+++ b/Launch.sh
@@ -1,16 +1,18 @@
 #!/bin/bash
+source ./tools/center
+
 clear
-bash ./tools/center -n -t "First Time? try the Help Menu"
-bash ./tools/center -n -t "Welcome to"
-bash ./tools/center -n -t "Bash Dungeon Crawler"
-bash ./tools/center -n -t "┏━━━━━━━━━━┓" -b "\033[1;30;47m" -e "\033[0m"
-bash ./tools/center -n -t "┃ Options: ┃" -b "\033[1;30;47m" -e "\033[0m"
-bash ./tools/center -n -t "┣━━━━━━━━━━┫" -b "\033[1;30;47m" -e "\033[0m"
-bash ./tools/center -n -t "┃ Start: s ┃" -b "\033[1;30;47m" -e "\033[0m"
-bash ./tools/center -n -t "┃ Help:  h ┃" -b "\033[1;30;47m" -e "\033[0m"
-bash ./tools/center -n -t "┃ Quit:  q ┃" -b "\033[1;30;47m" -e "\033[0m"
-bash ./tools/center -n -t "┗━━━━━━━━━━┛" -b "\033[1;30;47m" -e "\033[0m"
-bash ./tools/center -n -t "   Choice:  " -b "\033[41m" -e "\033[0m"
+center "First Time? try the Help Menu"
+center "Welcome to"
+center "Bash Dungeon Crawler"
+center "┏━━━━━━━━━━┓" "\033[1;30;47m" "\033[0m"
+center "┃ Options: ┃" "\033[1;30;47m" "\033[0m"
+center "┣━━━━━━━━━━┫" "\033[1;30;47m" "\033[0m"
+center "┃ Start: s ┃" "\033[1;30;47m" "\033[0m"
+center "┃ Help:  h ┃" "\033[1;30;47m" "\033[0m"
+center "┃ Quit:  q ┃" "\033[1;30;47m" "\033[0m"
+center "┗━━━━━━━━━━┛" "\033[1;30;47m" "\033[0m"
+center "   Choice:  " "\033[41m" "\033[0m"
 bash ./tools/center -t ""
 read -d'' -s -n1 input

@@ -28,7 +30,7 @@ elif [ "$input" == "h" ]
 else
  clear
  echo
-  bash ./tools/center -n -t "Not a vaild Option!" -b "\033[30;41m" -e "\033[0m"
+  center "Not a vaild Option!" "\033[30;41m" "\033[0m"
  sleep 1
  bash ./Launch.sh
  exit
--- a/Menus/Menu.sh
+++ b/Menus/Menu.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
+source ./tools/center
+
 clear
-bash ./tools/center -n -t "┏━━━━━Paused━━━━━┓" -b "\033[1;30;47m" -e "\033[0m"
-bash ./tools/center -n -t "┃ Resume: e or b ┃" -b "\033[1;30;47m" -e "\033[0m"
-bash ./tools/center -n -t "┃ Help:     h    ┃" -b "\033[1;30;47m" -e "\033[0m"
-bash ./tools/center -n -t "┗━━━━━━━━━━━━━━━━┛" -b "\033[1;30;47m" -e "\033[0m"
+center "┏━━━━━Paused━━━━━┓" "\033[1;30;47m" "\033[0m"
+center "┃ Resume: e or b ┃" "\033[1;30;47m" "\033[0m"
+center "┃ Help:     h    ┃" "\033[1;30;47m" "\033[0m"
+center "┗━━━━━━━━━━━━━━━━┛" "\033[1;30;47m" "\033[0m"

 read -d'' -s -n1 input
 if [ "$input" == "e" ] || [ "$input" == 'b' ]
@@ -17,7 +19,7 @@ elif [ "$input" == "h" ]
 else
  clear
  echo
-  bash ./tools/center -n -t "Not a vaild Option!"
+  center "Not a vaild Option!"
  sleep 1
  bash ./Menus/Menu.sh
  exit
--- a/Menus/gameOver.sh
+++ b/Menus/gameOver.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
+source ./tools/center
 clear
-bash ./tools/center -n -t "┏━━━━━━Dead━━━━━━┓" -b "\033[30;41m" -e "\033[0m"
-bash ./tools/center -n -t "┃ Restart:   r   ┃" -b "\033[30;41m" -e "\033[0m"
-bash ./tools/center -n -t "┃ Help:      h   ┃" -b "\033[30;41m" -e "\033[0m"
-bash ./tools/center -n -t "┃ quit:      q   ┃" -b "\033[30;41m" -e "\033[0m"
-bash ./tools/center -n -t "┗━━━━━━━━━━━━━━━━┛" -b "\033[30;41m" -e "\033[0m"
-bash ./tools/center -n -t "   Choice:  " -b "\033[41m" -e "\033[0m"
+center "┏━━━━━━Dead━━━━━━┓" "\033[30;41m" "\033[0m"
+center "┃ Restart:   r   ┃" "\033[30;41m" "\033[0m"
+center "┃ Help:      h   ┃" "\033[30;41m" "\033[0m"
+center "┃ quit:      q   ┃" "\033[30;41m" "\033[0m"
+center "┗━━━━━━━━━━━━━━━━┛" "\033[30;41m" "\033[0m"
+center "   Choice:  " "\033[41m" "\033[0m"
 bash ./tools/center -t ""
 read -d'' -s -n1 input

@@ -24,7 +25,7 @@ elif [ "$input" == "h" ]
 else
  clear
  echo
-  bash ./tools/center -n -t "Not a vaild Option!" -b "\033[30;41m" -e "\033[0m"
+  center "Not a vaild Option!" "\033[30;41m" "\033[0m"
  sleep 1
  bash ./Menus/gameOver.sh
  exit
--- a/Menus/helpMenu.sh
+++ b/Menus/helpMenu.sh
@@ -1,22 +1,24 @@
 #!/bin/bash
+source ./tools/center
+
 generalHelp() {
  clear
-  bash ./tools/center -n -t "┏━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┓" -b "\033[1;30;47m" -e "\033[0m"
-  bash ./tools/center -n -t "┃\e[1;30;40m   Movement:    \e[1;30;47m┃\e[1;30;40m     Misc:      \e[1;30;47m┃" -b "\033[1;30;47m" -e "\033[0m" -s 44
-  bash ./tools/center -n -t "┣━━━━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━┫" -b "\033[1;30;47m" -e "\033[0m"
-  bash ./tools/center -n -t "┃ Move Up:    w  ┃    You Are:    ┃" -b "\033[1;30;47m" -e "\033[0m"
-  bash ./tools/center -n -t "┃ Move Left:  a  ┃      \e[0m @ \e[1;30;47m       ┃" -b "\033[1;30;47m" -e "\033[0m" -s 16
-  bash ./tools/center -n -t "┃ Move Down:  s  ┃                ┃" -b "\033[1;30;47m" -e "\033[0m"
-  bash ./tools/center -n -t "┃ Move Right: d  ┃  Avoid These:  ┃" -b "\033[1;30;47m" -e "\033[0m"
-  bash ./tools/center -n -t "┣━━━━━━━━━━━━━━━━┫      \e[31;40m x \e[1;30;47m       ┃" -b "\033[1;30;47m" -e "\033[0m" -s 20
-  bash ./tools/center -n -t "┃\e[1;30;40m  Other Keys:   \e[1;30;47m┃                ┃" -b "\033[1;30;47m" -e "\033[0m" -s 22
-  bash ./tools/center -n -t "┣━━━━━━━━━━━━━━━━┫                ┃" -b "\033[1;30;47m" -e "\033[0m"
-  bash ./tools/center -n -t "┃ Pause:      e  ┃                ┃" -b "\033[1;30;47m" -e "\033[0m"
-  bash ./tools/center -n -t "┣━━━━━━━━━━━━━━━━┻━━━━━━━━━━━━━━━━┫" -b "\033[1;30;47m" -e "\033[0m"
-  bash ./tools/center -n -t "┃        Hit 'b' to go back       ┃" -b "\033[1;30;47m" -e "\033[0m"
-  bash ./tools/center -n -t "┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛" -b "\033[1;30;47m" -e "\033[0m"
-  bash ./tools/center -n -t "              Choice:              " -b "\033[41m" -e "\033[0m"
-  bash ./tools/center -t ""
+  center "┏━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┓" "\033[1;30;47m" "\033[0m"
+  center "┃\e[1;30;40m   Movement:    \e[1;30;47m┃\e[1;30;40m     Misc:      \e[1;30;47m┃" "\033[1;30;47m" "\033[0m" 44
+  center "┣━━━━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━┫" "\033[1;30;47m" "\033[0m"
+  center "┃ Move Up:    w  ┃    You Are:    ┃" "\033[1;30;47m" "\033[0m"
+  center "┃ Move Left:  a  ┃      \e[0m @ \e[1;30;47m       ┃" "\033[1;30;47m" "\033[0m" 16
+  center "┃ Move Down:  s  ┃                ┃" "\033[1;30;47m" "\033[0m"
+  center "┃ Move Right: d  ┃  Avoid These:  ┃" "\033[1;30;47m" "\033[0m"
+  center "┣━━━━━━━━━━━━━━━━┫      \e[31;40m x \e[1;30;47m       ┃" "\033[1;30;47m" "\033[0m" 20
+  center "┃\e[1;30;40m  Other Keys:   \e[1;30;47m┃                ┃" "\033[1;30;47m" "\033[0m" 22
+  center "┣━━━━━━━━━━━━━━━━┫                ┃" "\033[1;30;47m" "\033[0m"
+  center "┃ Pause:      e  ┃                ┃" "\033[1;30;47m" "\033[0m"
+  center "┣━━━━━━━━━━━━━━━━┻━━━━━━━━━━━━━━━━┫" "\033[1;30;47m" "\033[0m"
+  center "┃        Hit 'b' to go back       ┃" "\033[1;30;47m" "\033[0m"
+  center "┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛" "\033[1;30;47m" "\033[0m"
+  center "              Choice:              " "\033[41m" "\033[0m"
+  center ""
  read -d'' -s -n1 input

  if [ "$1" == "Menu" ]
@@ -48,11 +50,11 @@ generalHelp() {
    else
      clear
      echo
-      bash ./tools/center -n -t "Not a vaild Option!"
+      center "Not a vaild Option!"
      sleep 0.5
      bash ./Menus/helpMenu.sh
      exit
    fi
  fi
 }
-generalHelp $1
+generalHelp $1
--- a/rooms/room1.sh
+++ b/rooms/room1.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+source ./tools/center

 lives=3
 layer=("┏━┛ ┗━┓" "┃     ┃" "┗━━━━━┛")
@@ -13,7 +14,7 @@ exitGame() {
 }

 render() {
-  space=$(bash ./tools/center -r -t $layer)
+  space=$(centerO $layer)
  echo -e "\033[$[playerY-1];${space}f${layer[$playerY-2]}"
  echo -e "\033[${playerY};${space}f${layer[$playerY-1]}"
  echo -e "\033[$[playerY+1];${space}f${layer[$playerY]}"
--- a/rooms/room2.sh
+++ b/rooms/room2.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+source ./tools/center
+
 # Arrays
 layer=("┏━━━━━━━━━━━┓" "┃xwxwwwxwwww┃" "┃wwwwwwwwwww┃" "┃▒▒▒▒▒▒▒▒▒▒▒┃" "┃aaaaxaaaaaa┃" "┃aaaaaaaaaaa┃" "┃aaaaaaaaaaa┃" "┗━━━━┓a┏━━━━┛")
 processThis=("w" "\\e[44m \\e[0m" "▒" "\\e[34m▒\\e[0m" "x" "\\e[31mx\\e[0m" "X" "\\e[31mW\\e[0m" "a" "\\e[30m \\e[0m")
@@ -62,7 +64,7 @@ processMap() {
 render() {
  processMap
  yMod=1
-  space=$(bash ./tools/center -r -t $layer)
+  space=$(centerO $layer)
  space=$[space+1]
  # bash ./tools/center -n -t " Bash Dungeon " -b "\033[47;3;31m" -e "\033[0m" -s -2
  echo -e "\033[1;40m    \033[0m"
--- a/tools/center
+++ b/tools/center
@@ -1,98 +1,23 @@
 #!/bin/bash

-while getopts ":ht:nb:e:s:r" opt; do
-  case $opt in
-    h)
-    echo "Usage:
- center [options] <stringToCenter>"
-    exit
-    ;;
-    t)
-    text="$OPTARG"
-    ;;
-    n)
-    newline=TRUE
-    ;;
-    b)
-    beginingPram=$OPTARG
-    ;;
-    e)
-    endPram=$OPTARG
-    ;;
-    s)
-    subtract=$OPTARG
-    ;;
-    r)
-    return=TRUE
-    ;;
-    \?)
-    echo "Invalid option: -$OPTARG" >&2
-    exit 1
-    ;;
-    :)
-    echo "Option -$OPTARG requires an argument." >&2
-    exit 1
-    ;;
-  esac
-done
-
-COLUMNS=$(tput cols)
-CENTER=$[COLUMNS/2]
-# echo $CENTER
-ROWS=$(tput lines)
-
-center() {
-  space=""
-  begining=$2
-  end=$3
-  length=${#1}
-  length=$[length-subtract]
-  length=$[length/2]
-  center=$[CENTER-length]
-  for ((i = 0; i <= $center; i++))
-  do
-    # echo $i
-    space=" ${space}"
-  done
-  echo -e "$space$begining$1$end"
+center() {  
+  if [[ ! $4 ]]; then
+    subtract=0
+  else
+    subtract=$4
+  fi
+  echo -e "\033[$(expr $(expr $(tput cols) / 2) - $(expr $(expr ${#1} - $subtract) / 2))C$2$1$3"
 }

 centerf() {
-  space=""
-  begining=$2
-  end=$3
-  length=${#1}
-  length=$[length-subtract]
-  length=$[length/2]
-  center=$[CENTER-length]
-  for ((i = 0; i <= $center; i++))
-  do
-    # echo $i
-    space=" ${space}"
-  done
-  printf "$space$begining$1$end"
+  if [[ ! $4 ]]; then
+    subtract=0
+  else
+    subtract=$4
+  fi
+  printf "\033[$(expr $(expr $(tput cols) / 2) - $(expr $(expr ${#1} - $subtract) / 2))C$2$1$3"
 }

 centerO() {
-  space=""
-  length=${#1}
-  length=$[length-subtract]
-  length=$[length/2]
-  center=$[CENTER-length]
-  for ((i = 0; i <= $center; i++))
-  do
-    # echo $i
-    space=" ${space}"
-  done
-  echo ${#space}
-}
-
-if [ "$newline" == "TRUE" ]
-then
-  center "$text" $beginingPram $endPram
-elif [ "$return" == "TRUE" ]
-then
-  centerO "$text"
-else
-  centerf "$text" $beginingPram $endPram
-fi
+  echo "$(expr $(expr $(tput cols) / 2) - $(expr ${#1} / 2))"
+}