diff --git a/vargtools b/vargtools index e057c8e..f8a4526 100644 --- a/vargtools +++ b/vargtools @@ -18,7 +18,7 @@ if [[ $(sudo id -u) != 0 ]]; then fi user_home=$(echo $HOME) -app_version=24101008 +app_version=24110122 init_version=0 base_repo=https://git.tcmeta.net/kurtis @@ -92,16 +92,24 @@ vMenuSettings() { } vMenuSystem() { - menuItems=( - "1. Setup Chicago95 " - "2. Update / Install Chromium Policy" - "B. Back " - ) - menuActions=( - installChicago95 - configChromium - vMenuMain - ) + menuNumberIndex=0 + if [ ! -d "$user_home/.themes/Chicago95" ]; then + menuNumberIndex=$((menuNumberIndex+1)) + menuItems+=("$menuNumberIndex. Setup Chicago95 ") + menuActions+=(installChicago95) + fi + if [ -x "$(command -v chromium)" ]; then + menuNumberIndex=$((menuNumberIndex+1)) + menuItems+=("$menuNumberIndex. Update / Install Chromium Policy") + menuActions+=(configChromium) + fi + if [ -x "$(command -v brave-browser)" ]; then + menuNumberIndex=$((menuNumberIndex+1)) + menuItems+=("$menuNumberIndex. Update / Install Brave Policy ") + menuActions+=(configBrave) + fi + menuItems+=("B. Back ") + menuActions+=(vMenuMain) menuTitle=" VargTools" menuWidth=60 menuLeft=20 @@ -126,11 +134,14 @@ vMenuSoftware() { menuItems+=("$menuNumberIndex. Chromium") menuActions+=(setupChromium) fi - if ! [ -x "$(command -v discord)" ]; then + if ! [ -x "$(command -v brave-browser)" ]; then + menuNumberIndex=$((menuNumberIndex+1)) + menuItems+=("$menuNumberIndex. Brave") + menuActions+=(setupBrave) + fi menuNumberIndex=$((menuNumberIndex+1)) menuItems+=("$menuNumberIndex. Discord") menuActions+=(installDiscord) - fi if ! [ -x "$(command -v subl)" ]; then menuNumberIndex=$((menuNumberIndex+1)) menuItems+=("$menuNumberIndex. Sublime Text Editor & Merge") @@ -158,7 +169,7 @@ doInit() { sudo sed -i "/^deb cdrom:/s/^/#/" /etc/apt/sources.list sudo apt update echo Installing base software - sudo apt install -y git python3 python3-pip pipx stow btop duf mugshot + sudo apt install -y git python3 python3-pip pipx stow btop duf echo installing console python apps pipx ensurepath pipx install thefuck @@ -168,6 +179,11 @@ doInit() { echo installing file explorer backend sudo apt install -y gvfs-backends fi + if [ "$init_version" -lt 24110122 ]; then + echo installing file explorer backend + sudo apt install -y gvfs-backends + fi + mugshot echo "$app_version" > /etc/vargtools/init echo Should be all upto date now .. press any key to continue read -n 1 @@ -302,6 +318,13 @@ setupChromium() { return 1 } +setupBrave() { + logo + installBrave + configBrave + return 1 +} + installBrave() { echo [Brave] Adding Repo sudo wget "https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg" -O /usr/share/keyrings/brave-browser-archive-keyring.gpg