mitsuo_makuda/linutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/linutil.git synced 2024-11-05 13:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33 from luca0N/dev-echo-colors

Browse Source 
Fix colors with echo commands
This commit is contained in:
Chris Titus 2024-07-18 22:35:24 -05:00 committed by GitHub
commit ca5f72a75c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/commands/common-script.sh
View File

@ -14,7 +14,7 @@ checkEnv() {
REQUIREMENTS='curl groups sudo' REQUIREMENTS='curl groups sudo'
for req in ${REQUIREMENTS}; do for req in ${REQUIREMENTS}; do
if ! command_exists ${req}; then if ! command_exists ${req}; then
echo "${RED}To run me, you need: ${REQUIREMENTS}${RC}" echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
exit 1 exit 1
fi fi
done done
@ -30,7 +30,7 @@ checkEnv() {
done done
if [ -z "${PACKAGER}" ]; then if [ -z "${PACKAGER}" ]; then
echo "${RED}Can't find a supported package manager${RC}" echo -e "${RED}Can't find a supported package manager${RC}"
exit 1 exit 1
fi fi
@ -46,7 +46,7 @@ checkEnv() {
## Check if member of the sudo group. ## Check if member of the sudo group.
if ! groups | grep -q ${SUGROUP}; then if ! groups | grep -q ${SUGROUP}; then
echo "${RED}You need to be a member of the sudo group to run me!${RC}" echo -e "${RED}You need to be a member of the sudo group to run me!${RC}"
exit 1 exit 1
fi fi

6
src/commands/dotfiles/alacritty-setup.sh
View File

@ -14,7 +14,7 @@ checkEnv() {
REQUIREMENTS='curl groups sudo' REQUIREMENTS='curl groups sudo'
for req in ${REQUIREMENTS}; do for req in ${REQUIREMENTS}; do
if ! command_exists ${req}; then if ! command_exists ${req}; then
echo "${RED}To run me, you need: ${REQUIREMENTS}${RC}" echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
exit 1 exit 1
fi fi
done done
@ -30,7 +30,7 @@ checkEnv() {
done done
if [ -z "${PACKAGER}" ]; then if [ -z "${PACKAGER}" ]; then
echo "${RED}Can't find a supported package manager${RC}" echo -e "${RED}Can't find a supported package manager${RC}"
exit 1 exit 1
fi fi
@ -46,7 +46,7 @@ checkEnv() {
## Check if member of the sudo group. ## Check if member of the sudo group.
if ! groups | grep -q ${SUGROUP}; then if ! groups | grep -q ${SUGROUP}; then
echo "${RED}You need to be a member of the sudo group to run me!${RC}" echo -e "${RED}You need to be a member of the sudo group to run me!${RC}"
exit 1 exit 1
fi fi

6
src/commands/dotfiles/kitty-setup.sh
View File

@ -14,7 +14,7 @@ checkEnv() {
REQUIREMENTS='curl groups sudo' REQUIREMENTS='curl groups sudo'
for req in ${REQUIREMENTS}; do for req in ${REQUIREMENTS}; do
if ! command_exists ${req}; then if ! command_exists ${req}; then
echo "${RED}To run me, you need: ${REQUIREMENTS}${RC}" echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
exit 1 exit 1
fi fi
done done
@ -30,7 +30,7 @@ checkEnv() {
done done
if [ -z "${PACKAGER}" ]; then if [ -z "${PACKAGER}" ]; then
echo "${RED}Can't find a supported package manager${RC}" echo -e "${RED}Can't find a supported package manager${RC}"
exit 1 exit 1
fi fi
@ -46,7 +46,7 @@ checkEnv() {
## Check if member of the sudo group. ## Check if member of the sudo group.
if ! groups | grep -q ${SUGROUP}; then if ! groups | grep -q ${SUGROUP}; then
echo "${RED}You need to be a member of the sudo group to run me!${RC}" echo -e "${RED}You need to be a member of the sudo group to run me!${RC}"
exit 1 exit 1
fi fi

10
src/commands/dotfiles/rofi-setup.sh
View File

@ -14,7 +14,7 @@ checkEnv() {
REQUIREMENTS='curl groups sudo' REQUIREMENTS='curl groups sudo'
for req in $REQUIREMENTS; do for req in $REQUIREMENTS; do
if ! command_exists "$req"; then if ! command_exists "$req"; then
printf "${RED}To run me, you need: %s${RC}\n" "$REQUIREMENTS" echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
exit 1 exit 1
fi fi
done done
@ -24,13 +24,13 @@ checkEnv() {
for pgm in $PACKAGEMANAGER; do for pgm in $PACKAGEMANAGER; do
if command_exists "$pgm"; then if command_exists "$pgm"; then
PACKAGER="$pgm" PACKAGER="$pgm"
printf "Using %s\n" "$pgm" echo "Using $pgm"
break break
fi fi
done done
if [ -z "$PACKAGER" ]; then if [ -z "$PACKAGER" ]; then
printf "${RED}Can't find a supported package manager${RC}\n" echo -e "${RED}Can't find a supported package manager${RC}"
exit 1 exit 1
fi fi
@ -39,14 +39,14 @@ checkEnv() {
for sug in $SUPERUSERGROUP; do for sug in $SUPERUSERGROUP; do
if groups | grep -q "$sug"; then if groups | grep -q "$sug"; then
SUGROUP="$sug" SUGROUP="$sug"
printf "Super user group %s\n" "$SUGROUP" echo "Super user group $SUGROUP"
break break
fi fi
done done
## Check if member of the sudo group. ## Check if member of the sudo group.
if ! groups | grep -q "$SUGROUP"; then if ! groups | grep -q "$SUGROUP"; then
printf "${RED}You need to be a member of the sudo group to run me!${RC}\n" echo -e "${RED}You need to be a member of the sudo group to run me!${RC}\n"
exit 1 exit 1
fi fi

20
src/commands/system-setup/1-compile-setup.sh
View File

@ -9,18 +9,18 @@ GREEN='\033[32m'
LINUXTOOLBOXDIR="$HOME/linuxtoolbox" LINUXTOOLBOXDIR="$HOME/linuxtoolbox"
if [ ! -d "$LINUXTOOLBOXDIR" ]; then if [ ! -d "$LINUXTOOLBOXDIR" ]; then
echo "${YELLOW}Creating linuxtoolbox directory: $LINUXTOOLBOXDIR${RC}" echo -e "${YELLOW}Creating linuxtoolbox directory: $LINUXTOOLBOXDIR${RC}"
mkdir -p "$LINUXTOOLBOXDIR" mkdir -p "$LINUXTOOLBOXDIR"
echo "${GREEN}linuxtoolbox directory created: $LINUXTOOLBOXDIR${RC}" echo -e "${GREEN}linuxtoolbox directory created: $LINUXTOOLBOXDIR${RC}"
fi fi
if [ ! -d "$LINUXTOOLBOXDIR/linux-setup" ]; then if [ ! -d "$LINUXTOOLBOXDIR/linux-setup" ]; then
echo "${YELLOW}Cloning linux-setup repository into: $LINUXTOOLBOXDIR/linux-setup${RC}" echo -e "${YELLOW}Cloning linux-setup repository into: $LINUXTOOLBOXDIR/linux-setup${RC}"
git clone https://github.com/ChrisTitusTech/linux-setup "$LINUXTOOLBOXDIR/linux-setup" git clone https://github.com/ChrisTitusTech/linux-setup "$LINUXTOOLBOXDIR/linux-setup"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "${GREEN}Successfully cloned linux-setup repository${RC}" echo -e "${GREEN}Successfully cloned linux-setup repository${RC}"
else else
echo "${RED}Failed to clone linux-setup repository${RC}" echo -e "${RED}Failed to clone linux-setup repository${RC}"
exit 1 exit 1
fi fi
fi fi
@ -36,7 +36,7 @@ checkEnv() {
REQUIREMENTS='curl groups sudo' REQUIREMENTS='curl groups sudo'
for req in $REQUIREMENTS; do for req in $REQUIREMENTS; do
if ! command_exists "$req"; then if ! command_exists "$req"; then
echo "${RED}To run me, you need: $REQUIREMENTS${RC}" echo -e "${RED}To run me, you need: $REQUIREMENTS${RC}"
exit 1 exit 1
fi fi
done done
@ -52,14 +52,14 @@ checkEnv() {
done done
if [ -z "$PACKAGER" ]; then if [ -z "$PACKAGER" ]; then
echo "${RED}Can't find a supported package manager${RC}" echo -e "${RED}Can't find a supported package manager${RC}"
exit 1 exit 1
fi fi
## Check if the current directory is writable. ## Check if the current directory is writable.
GITPATH="$(dirname "$(realpath "$0")")" GITPATH="$(dirname "$(realpath "$0")")"
if [ ! -w "$GITPATH" ]; then if [ ! -w "$GITPATH" ]; then
echo "${RED}Can't write to $GITPATH${RC}" echo -e "${RED}Can't write to $GITPATH${RC}"
exit 1 exit 1
fi fi
@ -75,7 +75,7 @@ checkEnv() {
## Check if member of the sudo group. ## Check if member of the sudo group.
if ! groups | grep -q "$SUGROUP"; then if ! groups | grep -q "$SUGROUP"; then
echo "${RED}You need to be a member of the sudo group to run me!${RC}" echo -e "${RED}You need to be a member of the sudo group to run me!${RC}"
exit 1 exit 1
fi fi
} }
@ -83,7 +83,7 @@ checkEnv() {
installDepend() { installDepend() {
## Check for dependencies. ## Check for dependencies.
DEPENDENCIES='tar tree multitail tldr trash-cli unzip cmake make jq' DEPENDENCIES='tar tree multitail tldr trash-cli unzip cmake make jq'
echo "${YELLOW}Installing dependencies...${RC}" echo -e "${YELLOW}Installing dependencies...${RC}"
case $PACKAGER in case $PACKAGER in
pacman) pacman)
if ! grep -q "^\s*\[multilib\]" /etc/pacman.conf; then if ! grep -q "^\s*\[multilib\]" /etc/pacman.conf; then

4
src/commands/system-setup/2-gaming-setup.sh
View File

@ -22,7 +22,7 @@ checkEnv() {
for pgm in ${PACKAGEMANAGER}; do for pgm in ${PACKAGEMANAGER}; do
if command_exists ${pgm}; then if command_exists ${pgm}; then
PACKAGER=${pgm} PACKAGER=${pgm}
echo -e "Using ${pgm}" echo "Using ${pgm}"
fi fi
done done
@ -43,7 +43,7 @@ checkEnv() {
for sug in ${SUPERUSERGROUP}; do for sug in ${SUPERUSERGROUP}; do
if groups | grep ${sug}; then if groups | grep ${sug}; then
SUGROUP=${sug} SUGROUP=${sug}
echo -e "Super user group ${SUGROUP}" echo "Super user group ${SUGROUP}"
fi fi
done done

28
src/commands/system-update.sh
View File

@ -14,7 +14,7 @@ checkEnv() {
REQUIREMENTS='curl groups sudo' REQUIREMENTS='curl groups sudo'
for req in ${REQUIREMENTS}; do for req in ${REQUIREMENTS}; do
if ! command_exists ${req}; then if ! command_exists ${req}; then
printf "${RED}To run me, you need: ${REQUIREMENTS}${RC}\n" echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
exit 1 exit 1
fi fi
done done
@ -23,13 +23,13 @@ checkEnv() {
for pgm in ${PACKAGEMANAGER}; do for pgm in ${PACKAGEMANAGER}; do
if command_exists ${pgm}; then if command_exists ${pgm}; then
PACKAGER=${pgm} PACKAGER=${pgm}
printf "Using ${pgm}\n" echo "Using ${pgm}"
break break
fi fi
done done
if [ -z "${PACKAGER}" ]; then if [ -z "${PACKAGER}" ]; then
printf "${RED}Can't find a supported package manager${RC}\n" echo -e "${RED}Can't find a supported package manager${RC}"
exit 1 exit 1
fi fi
@ -38,14 +38,14 @@ checkEnv() {
for sug in ${SUPERUSERGROUP}; do for sug in ${SUPERUSERGROUP}; do
if groups | grep ${sug} >/dev/null; then if groups | grep ${sug} >/dev/null; then
SUGROUP=${sug} SUGROUP=${sug}
printf "Super user group ${SUGROUP}\n" echo "Super user group ${SUGROUP}"
break break
fi fi
done done
## Check if member of the sudo group. ## Check if member of the sudo group.
if ! groups | grep ${SUGROUP} >/dev/null; then if ! groups | grep ${SUGROUP} >/dev/null; then
printf "${RED}You need to be a member of the sudo group to run me!${RC}\n" echo -e "${RED}You need to be a member of the sudo group to run me!${RC}"
exit 1 exit 1
fi fi
@ -61,19 +61,19 @@ fastUpdate() {
case ${PACKAGER} in case ${PACKAGER} in
pacman) pacman)
if ! command_exists yay && ! command_exists paru; then if ! command_exists yay && ! command_exists paru; then
printf "Installing yay as AUR helper...\n" echo "Installing yay as AUR helper..."
sudo ${PACKAGER} --noconfirm -S base-devel || { printf "${RED}Failed to install base-devel${RC}\n"; exit 1; } sudo ${PACKAGER} --noconfirm -S base-devel || { echo -e "${RED}Failed to install base-devel${RC}"; exit 1; }
cd /opt && sudo git clone https://aur.archlinux.org/yay-git.git && sudo chown -R ${USER}:${USER} ./yay-git cd /opt && sudo git clone https://aur.archlinux.org/yay-git.git && sudo chown -R ${USER}:${USER} ./yay-git
cd yay-git && makepkg --noconfirm -si || { printf "${RED}Failed to install yay${RC}\n"; exit 1; } cd yay-git && makepkg --noconfirm -si || { echo -e "${RED}Failed to install yay${RC}"; exit 1; }
else else
printf "Aur helper already installed\n" echo "Aur helper already installed"
fi fi
if command_exists yay; then if command_exists yay; then
AUR_HELPER="yay" AUR_HELPER="yay"
elif command_exists paru; then elif command_exists paru; then
AUR_HELPER="paru" AUR_HELPER="paru"
else else
printf "No AUR helper found. Please install yay or paru.\n" echo "No AUR helper found. Please install yay or paru."
exit 1 exit 1
fi fi
${AUR_HELPER} --noconfirm -S rate-mirrors-bin ${AUR_HELPER} --noconfirm -S rate-mirrors-bin
@ -91,7 +91,7 @@ fastUpdate() {
apt-get|nala) apt-get|nala)
sudo apt-get update sudo apt-get update
if ! command_exists nala; then if ! command_exists nala; then
sudo apt-get install -y nala || { printf "${YELLOW}Falling back to apt-get${RC}\n"; PACKAGER="apt-get"; } sudo apt-get install -y nala || { echo -e "${YELLOW}Falling back to apt-get${RC}"; PACKAGER="apt-get"; }
fi fi
if [ "${PACKAGER}" = "nala" ]; then if [ "${PACKAGER}" = "nala" ]; then
sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak
@ -112,14 +112,14 @@ fastUpdate() {
sudo ${PACKAGER} upgrade -y sudo ${PACKAGER} upgrade -y
;; ;;
*) *)
printf "${RED}Unsupported package manager: ${PACKAGER}${RC}\n" echo -e "${RED}Unsupported package manager: $PACKAGER${RC}"
exit 1 exit 1
;; ;;
esac esac
} }
updateSystem() { updateSystem() {
printf "${GREEN}Updating system${RC}\n" echo -e "${GREEN}Updating system${RC}"
case ${PACKAGER} in case ${PACKAGER} in
nala|apt-get) nala|apt-get)
sudo ${PACKAGER} update -y sudo ${PACKAGER} update -y
@ -137,7 +137,7 @@ updateSystem() {
sudo ${PACKAGER} update -y sudo ${PACKAGER} update -y
;; ;;
*) *)
printf "${RED}Unsupported package manager: ${PACKAGER}${RC}\n" echo -e "${RED}Unsupported package manager: ${PACKAGER}${RC}"
exit 1 exit 1
;; ;;
esac esac

2
start.sh
View File

@ -10,7 +10,7 @@ check() {
local message=$2 local message=$2
if [ $exit_code -ne 0 ]; then if [ $exit_code -ne 0 ]; then
echo "${RED}ERROR: $message${RC}" echo -e "${RED}ERROR: $message${RC}"
exit 1 exit 1
fi fi
} }

2
startdev.sh
View File

@ -32,7 +32,7 @@ check() {
local message=$2 local message=$2
if [ $exit_code -ne 0 ]; then if [ $exit_code -ne 0 ]; then
echo "${RED}ERROR: $message${RC}" echo -e "${RED}ERROR: $message${RC}"
exit 1 exit 1
fi fi
} }