From 23f07040ccbfd7e806eb35d470242b38c8c70f74 Mon Sep 17 00:00:00 2001 From: "John F. Mercer" Date: Sat, 21 Oct 2023 14:43:29 -0400 Subject: [PATCH] Add sec installs list --- .../run_onchange_before_10_installs.sh.tmpl | 23 +++++++++++-------- ...onchange_before_20_parrot_installs.sh.tmpl | 4 ++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.chezmoiscripts/linux/run_onchange_before_10_installs.sh.tmpl b/.chezmoiscripts/linux/run_onchange_before_10_installs.sh.tmpl index 202cb0b..4db4ec4 100644 --- a/.chezmoiscripts/linux/run_onchange_before_10_installs.sh.tmpl +++ b/.chezmoiscripts/linux/run_onchange_before_10_installs.sh.tmpl @@ -15,6 +15,7 @@ sudo apt update packages=( "bat" + "expect" # needed to set shell on Parrot "fzf" "gh" "git" @@ -34,6 +35,17 @@ packages=( "wget" ) +# security only packages +# this separate list helps with Github CI to pass +{{ if or (eq .osid "linux-kali") (eq .osid "linux-parrot") }} + +sec_packages=( + "seclists" +) +packages+=("${sec_packages[@]}") + +{{ end }} + # Loop through the array and install each package for package in "${packages[@]}"; do echo "Installing $package..." @@ -67,17 +79,10 @@ tar xf lazygit.tar.gz lazygit sudo install lazygit /usr/local/bin rm -rf "$HOME"/lazygit* -# Parrot install list -{{ if eq .osid "linux-parrot" }} - -sudo apt -y install expect - -{{ end }} - # Remove packages -packages=("nano") +rm_packages=("nano") -for pkg in "${packages[@]}"; do +for pkg in "${rm_packages[@]}"; do # Check if package is installed if command -v "$pkg" >/dev/null 2>&1; then echo "$pkg is installed. Removing it now." diff --git a/.chezmoiscripts/linux/run_onchange_before_20_parrot_installs.sh.tmpl b/.chezmoiscripts/linux/run_onchange_before_20_parrot_installs.sh.tmpl index cb1e89d..0fe2312 100644 --- a/.chezmoiscripts/linux/run_onchange_before_20_parrot_installs.sh.tmpl +++ b/.chezmoiscripts/linux/run_onchange_before_20_parrot_installs.sh.tmpl @@ -28,8 +28,8 @@ sudo update-alternatives --remove vim /usr/bin/nvim sudo apt install -y vim # Update specific packages -# sudo apt update -# sudo apt install -y codium +# apt is already updated in the previous install script +sudo apt install -y codium # TODO: Adjust keyboard shortcuts with kinto # https://github.com/rbreaves/kinto