Merge branch 'master' of github.com:Lissy93/dotfiles

This commit is contained in:
Alicia Sykes 2023-09-04 20:17:09 +01:00
commit 47f74f5989
5 changed files with 8 additions and 8 deletions

View File

@ -84,8 +84,8 @@ make_intro () {
" ${C3}- On Arch Linux, updates and installs packages via Pacman\n"\ " ${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 Debian Linux, updates and installs packages via apt get\n"\
" ${C3}- On Linux desktop systems, prompt to install desktop apps via Flatpak\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"\ " ${C3}- Checks that OS is up-to-date and critical patches are installed\n"\
"${C2}(4) Configure sytstem\n"\ "${C2}(4) Configure system\n"\
" ${C3}- Setup Vim, and install / update Vim plugins via Plug\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 Tmux, and install / update Tmux plugins via TPM\n"\
" ${C3}- Setup ZSH, and install / update ZSH plugins via Antigen\n"\ " ${C3}- Setup ZSH, and install / update ZSH plugins via Antigen\n"\
@ -227,7 +227,7 @@ function setup_dot_files () {
# If git clone / pull failed, then exit with error # If git clone / pull failed, then exit with error
if ! test "$?" -eq 0; then 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 terminate
fi fi
@ -425,7 +425,7 @@ fi
# Let's Begin! # Let's Begin!
pre_setup_tasks # Print start message, and check requirements are met 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 install_packages # Prompt to install / update OS-specific packages
apply_preferences # Apply settings for individual applications apply_preferences # Apply settings for individual applications
finishing_up # Refresh current session, print summary and exit finishing_up # Refresh current session, print summary and exit

View File

@ -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 read -t $PROMPT_TIMEOUT -n 1 -r
echo echo
if [[ $REPLY =~ ^[Yy]$ ]]; then if [[ $REPLY =~ ^[Yy]$ ]]; then
echo -e "${PURPLE}Updating dadatbase...${RESET}" echo -e "${PURPLE}Updating database...${RESET}"
sudo pacman -Syy --noconfirm sudo pacman -Syy --noconfirm
fi fi

View File

@ -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 read -t $PROMPT_TIMEOUT -n 1 -r
echo echo
if [[ $REPLY =~ ^[Yy]$ ]]; then if [[ $REPLY =~ ^[Yy]$ ]]; then
echo -e "${PURPLE}Updating dadatbase...${RESET}" echo -e "${PURPLE}Updating database...${RESET}"
sudo apt update sudo apt update
fi fi

View File

@ -4,7 +4,7 @@
# Linux Desktop Application Installations via Flatpak # # Linux Desktop Application Installations via Flatpak #
###################################################################### ######################################################################
# This script will: # # 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 # # - Update currently installed Flatpak apps from FlatHub #
# - Check app not already installed via system package manager # # - Check app not already installed via system package manager #
# - Then install any not-yet-installed that are apps listed # # - Then install any not-yet-installed that are apps listed #

View File

@ -39,7 +39,7 @@ winget_apps=(
'Keybase.Keybase' 'Keybase.Keybase'
'KeePassXCTeam.KeePassXC' 'KeePassXCTeam.KeePassXC'
# Netowking # Networking
'WiresharkFoundation.Wireshark' 'WiresharkFoundation.Wireshark'
'angryziber.AngryIPScanner' 'angryziber.AngryIPScanner'