Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Lissy93/dotfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
Lissy93 committed Sep 4, 2023
2 parents febd166 + dae1803 commit 47f74f5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ make_intro () {
" ${C3}- On Arch Linux, updates and installs packages via Pacman\n"\
" ${C3}- On Debian Linux, updates and installs packages via apt get\n"\
" ${C3}- On Linux desktop systems, prompt to install desktop apps via Flatpak\n"\
" ${C3}- Checks that OS is up-to-date and criticial patches are installed\n"\
"${C2}(4) Configure sytstem\n"\
" ${C3}- Checks that OS is up-to-date and critical patches are installed\n"\
"${C2}(4) Configure system\n"\
" ${C3}- Setup Vim, and install / update Vim plugins via Plug\n"\
" ${C3}- Setup Tmux, and install / update Tmux plugins via TPM\n"\
" ${C3}- Setup ZSH, and install / update ZSH plugins via Antigen\n"\
Expand Down Expand Up @@ -227,7 +227,7 @@ function setup_dot_files () {

# If git clone / pull failed, then exit with error
if ! test "$?" -eq 0; then
echo -e >&2 "${RED_B}Failed to fetch dotfiels from git${RESET}"
echo -e >&2 "${RED_B}Failed to fetch dotfiles from git${RESET}"
terminate
fi

Expand Down Expand Up @@ -425,7 +425,7 @@ fi

# Let's Begin!
pre_setup_tasks # Print start message, and check requirements are met
setup_dot_files # Clone / updatae dotfiles, and create the symlinks
setup_dot_files # Clone / update dotfiles, and create the symlinks
install_packages # Prompt to install / update OS-specific packages
apply_preferences # Apply settings for individual applications
finishing_up # Refresh current session, print summary and exit
Expand Down
2 changes: 1 addition & 1 deletion scripts/installs/arch-pacman.sh
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ echo -e "${CYAN_B}Would you like to update package database? (y/N)${RESET}\n"
read -t $PROMPT_TIMEOUT -n 1 -r
echo
if [[ $REPLY =~ ^[Yy]$ ]]; then
echo -e "${PURPLE}Updating dadatbase...${RESET}"
echo -e "${PURPLE}Updating database...${RESET}"
sudo pacman -Syy --noconfirm
fi

Expand Down
2 changes: 1 addition & 1 deletion scripts/installs/debian-apt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ echo -e "${CYAN_B}Would you like to update package database? (y/N)${RESET}\n"
read -t $PROMPT_TIMEOUT -n 1 -r
echo
if [[ $REPLY =~ ^[Yy]$ ]]; then
echo -e "${PURPLE}Updating dadatbase...${RESET}"
echo -e "${PURPLE}Updating database...${RESET}"
sudo apt update
fi

Expand Down
2 changes: 1 addition & 1 deletion scripts/installs/flatpak.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Linux Desktop Application Installations via Flatpak #
######################################################################
# This script will: #
# - Check that Flatpak is installed / promt to install #
# - Check that Flatpak is installed / prompt to install #
# - Update currently installed Flatpak apps from FlatHub #
# - Check app not already installed via system package manager #
# - Then install any not-yet-installed that are apps listed #
Expand Down
2 changes: 1 addition & 1 deletion scripts/installs/windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ winget_apps=(
'Keybase.Keybase'
'KeePassXCTeam.KeePassXC'

# Netowking
# Networking
'WiresharkFoundation.Wireshark'
'angryziber.AngryIPScanner'

Expand Down

0 comments on commit 47f74f5

Please sign in to comment.