Merge pull request #432 from nnyyxxxx/testing-6

Fix grammatical errors
This commit is contained in:
Chris Titus 2024-09-18 13:06:20 -05:00 committed by GitHub
commit 02b7d7cdf7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 31 additions and 28 deletions

View File

@ -2,8 +2,8 @@
. ../common-script.sh . ../common-script.sh
setupAlacritty() { installAlacritty() {
echo "Install Alacritty if not already installed..." echo "Installing Alacritty..."
if ! command_exists alacritty; then if ! command_exists alacritty; then
case ${PACKAGER} in case ${PACKAGER} in
pacman) pacman)
@ -14,12 +14,12 @@ setupAlacritty() {
;; ;;
esac esac
else else
echo "alacritty is already installed." echo "Alacritty is already installed."
fi fi
} }
setupAlacrittyConfig() { setupAlacrittyConfig() {
echo "Copy alacritty config files" echo "Copying Alacritty configuration files..."
if [ -d "${HOME}/.config/alacritty" ] && [ ! -d "${HOME}/.config/alacritty-bak" ]; then if [ -d "${HOME}/.config/alacritty" ] && [ ! -d "${HOME}/.config/alacritty-bak" ]; then
cp -r "${HOME}/.config/alacritty" "${HOME}/.config/alacritty-bak" cp -r "${HOME}/.config/alacritty" "${HOME}/.config/alacritty-bak"
fi fi
@ -30,5 +30,5 @@ setupAlacrittyConfig() {
checkEnv checkEnv
checkEscalationTool checkEscalationTool
setupAlacritty installAlacritty
setupAlacrittyConfig setupAlacrittyConfig

View File

@ -2,8 +2,8 @@
. ../common-script.sh . ../common-script.sh
setupFastfetch() { installFastfetch() {
echo "Installing Fastfetch if not already installed..." echo "Installing Fastfetch..."
if ! command_exists fastfetch; then if ! command_exists fastfetch; then
case ${PACKAGER} in case ${PACKAGER} in
pacman) pacman)
@ -29,5 +29,5 @@ setupFastfetchConfig() {
checkEnv checkEnv
checkEscalationTool checkEscalationTool
setupFastfetch installFastfetch
setupFastfetchConfig setupFastfetchConfig

View File

@ -2,8 +2,8 @@
. ../common-script.sh . ../common-script.sh
setupKitty() { installKitty() {
echo "Install Kitty if not already installed..." echo "Installing Kitty..."
if ! command_exists kitty; then if ! command_exists kitty; then
case ${PACKAGER} in case ${PACKAGER} in
pacman) pacman)
@ -19,7 +19,7 @@ setupKitty() {
} }
setupKittyConfig() { setupKittyConfig() {
echo "Copy Kitty config files" echo "Copying Kitty configuration files..."
if [ -d "${HOME}/.config/kitty" ] && [ ! -d "${HOME}/.config/kitty-bak" ]; then if [ -d "${HOME}/.config/kitty" ] && [ ! -d "${HOME}/.config/kitty-bak" ]; then
cp -r "${HOME}/.config/kitty" "${HOME}/.config/kitty-bak" cp -r "${HOME}/.config/kitty" "${HOME}/.config/kitty-bak"
fi fi
@ -30,5 +30,5 @@ setupKittyConfig() {
checkEnv checkEnv
checkEscalationTool checkEscalationTool
setupKitty installKitty
setupKittyConfig setupKittyConfig

View File

@ -14,7 +14,7 @@ cloneMyBash() {
} }
installDepend() { installDepend() {
echo "Install mybash if not already installed" echo "Installing Bash..."
case "$PACKAGER" in case "$PACKAGER" in
pacman) pacman)
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm bash bash-completion tar bat tree unzip fontconfig $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm bash bash-completion tar bat tree unzip fontconfig

View File

@ -13,8 +13,8 @@ cloneNeovim() {
cd "$HOME" && git clone https://github.com/ChrisTitusTech/neovim.git "$HOME/.local/share/neovim" cd "$HOME" && git clone https://github.com/ChrisTitusTech/neovim.git "$HOME/.local/share/neovim"
} }
setupNeovim() { installNeovim() {
echo "Install Neovim if not already installed" echo "Installing Neovim..."
case "$PACKAGER" in case "$PACKAGER" in
pacman) pacman)
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm neovim ripgrep fzf python-virtualenv luarocks go shellcheck $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm neovim ripgrep fzf python-virtualenv luarocks go shellcheck
@ -36,6 +36,7 @@ setupNeovim() {
} }
backupNeovimConfig() { backupNeovimConfig() {
printf "%b\n" "${YELLOW}Backing up existing configuration files...${RC}"
if [ -d "$HOME/.config/nvim" ] && [ ! -d "$HOME/.config/nvim-backup" ]; then if [ -d "$HOME/.config/nvim" ] && [ ! -d "$HOME/.config/nvim-backup" ]; then
cp -r "$HOME/.config/nvim" "$HOME/.config/nvim-backup" cp -r "$HOME/.config/nvim" "$HOME/.config/nvim-backup"
fi fi
@ -43,6 +44,7 @@ backupNeovimConfig() {
} }
linkNeovimConfig() { linkNeovimConfig() {
printf "%b\n" "${YELLOW}Linking Neovim configuration files...${RC}"
mkdir -p "$HOME/.config/nvim" mkdir -p "$HOME/.config/nvim"
ln -s "$gitpath/titus-kickstart/"* "$HOME/.config/nvim/" # Wild card is used here to link all contents of titus-kickstart. ln -s "$gitpath/titus-kickstart/"* "$HOME/.config/nvim/" # Wild card is used here to link all contents of titus-kickstart.
} }
@ -50,6 +52,6 @@ linkNeovimConfig() {
checkEnv checkEnv
checkEscalationTool checkEscalationTool
cloneNeovim cloneNeovim
setupNeovim installNeovim
backupNeovimConfig backupNeovimConfig
linkNeovimConfig linkNeovimConfig

View File

@ -2,8 +2,8 @@
. ../common-script.sh . ../common-script.sh
setupRofi() { installRofi() {
echo "Install Rofi if not already installed..." echo "Installing Rofi..."
if ! command_exists rofi; then if ! command_exists rofi; then
case "$PACKAGER" in case "$PACKAGER" in
pacman) pacman)
@ -19,7 +19,7 @@ setupRofi() {
} }
setupRofiConfig() { setupRofiConfig() {
echo "Copy Rofi config files" echo "Copying Rofi configuration files..."
if [ -d "$HOME/.config/rofi" ] && [ ! -d "$HOME/.config/rofi-bak" ]; then if [ -d "$HOME/.config/rofi" ] && [ ! -d "$HOME/.config/rofi-bak" ]; then
cp -r "$HOME/.config/rofi" "$HOME/.config/rofi-bak" cp -r "$HOME/.config/rofi" "$HOME/.config/rofi-bak"
fi fi
@ -35,5 +35,5 @@ setupRofiConfig() {
checkEnv checkEnv
checkEscalationTool checkEscalationTool
setupRofi installRofi
setupRofiConfig setupRofiConfig

View File

@ -3,8 +3,8 @@
. ../common-script.sh . ../common-script.sh
# Function to install zsh # Function to install zsh
install_zsh() { installZsh() {
echo "Install ZSH if not already installed..." echo "Installing Zsh..."
if ! command_exists zsh; then if ! command_exists zsh; then
case "$PACKAGER" in case "$PACKAGER" in
pacman) pacman)
@ -20,7 +20,8 @@ install_zsh() {
} }
# Function to setup zsh configuration # Function to setup zsh configuration
setup_zsh_config() { setupZshConfig() {
echo "Setting up Zsh configuration..."
CONFIG_DIR="$HOME/.config/zsh" CONFIG_DIR="$HOME/.config/zsh"
ZSHRC_FILE="$CONFIG_DIR/.zshrc" ZSHRC_FILE="$CONFIG_DIR/.zshrc"
@ -48,5 +49,5 @@ EOL
checkEnv checkEnv
checkEscalationTool checkEscalationTool
install_zsh installZsh
setup_zsh_config setupZshConfig

View File

@ -3,7 +3,7 @@
. ../common-script.sh . ../common-script.sh
installPkg() { installPkg() {
echo "Install UFW if not already installed..." echo "Installing UFW..."
if ! command_exists ufw; then if ! command_exists ufw; then
case ${PACKAGER} in case ${PACKAGER} in
pacman) pacman)
@ -19,7 +19,7 @@ installPkg() {
} }
configureUFW() { configureUFW() {
printf "%b\n" "${GREEN}Using Chris Titus Recommended Firewall Rules${RC}" printf "%b\n" "${YELLOW}Using Chris Titus Recommended Firewall Rules${RC}"
echo "Disabling UFW" echo "Disabling UFW"
$ESCALATION_TOOL ufw disable $ESCALATION_TOOL ufw disable

View File

@ -61,7 +61,7 @@ fastUpdate() {
} }
updateSystem() { updateSystem() {
printf "%b\n" "${GREEN}Updating system${RC}" printf "%b\n" "${YELLOW}Updating system${RC}"
case ${PACKAGER} in case ${PACKAGER} in
nala|apt-get) nala|apt-get)
$ESCALATION_TOOL "${PACKAGER}" update -y $ESCALATION_TOOL "${PACKAGER}" update -y