From ac89310eebb4f7dad427e7c95e2d2479146a7b0c Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 1 Nov 2021 23:48:19 +0000 Subject: [PATCH] feat(xbar/brew-updates): move update all actions to overview status menu --- xbar/brew-updates.1h.rb | 45 +++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/xbar/brew-updates.1h.rb b/xbar/brew-updates.1h.rb index 1ca9315..c734d56 100755 --- a/xbar/brew-updates.1h.rb +++ b/xbar/brew-updates.1h.rb @@ -160,15 +160,28 @@ module Brew printer.item( "#{formulas.size} formulas / #{casks.size} casks#{pinned_msg}" ) do |printer| - printer.sep printer.item(':hourglass: Refresh', refresh: true) - end - printer.item('Upgrade All') do |printer| - printer.item('Are you sure?') - printer.item( - 'Yes', - terminal: true, refresh: true, shell: brew_path, param1: 'upgrade' - ) + printer.sep + if (formulas.size + casks.size).positive? + printer.item( + 'Upgrade All', + terminal: true, refresh: true, shell: brew_path, param1: 'upgrade' + ) + end + if formulas.size.positive? + printer.item( + 'Upgrade All Formulas', + terminal: true, refresh: true, shell: brew_path, param1: 'upgrade', + param2: '--formula' + ) + end + if casks.size.positive? + printer.item( + 'Upgrade All Casks', + terminal: true, refresh: true, shell: brew_path, param1: 'upgrade', + param2: '--cask' + ) + end end print_formulas(printer) @@ -184,14 +197,6 @@ module Brew printer.sep printer.item('Formulas:') - printer.item('Upgrade All') do |printer| - printer.item('Are you sure?') - printer.item( - 'Yes', - terminal: true, refresh: true, shell: brew_path, param1: 'upgrade', - param2: '--formula' - ) - end formulas.each do |formula| printer.item(formula.name) do |printer| printer.item( @@ -235,14 +240,6 @@ module Brew printer.sep printer.item('Casks:') - printer.item('Upgrade All') do |printer| - printer.item('Are you sure?') - printer.item( - 'Yes', - terminal: true, refresh: true, - shell: brew_path, param1: 'upgrade', param2: '--cask' - ) - end casks.each do |cask| printer.item(cask.name) do |printer| printer.item(