From 0cc1758b0219704cf5a72b8e06150c54041a98e5 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Fri, 22 Oct 2021 16:50:26 -0400 Subject: ifinstalled better, close #1047 --- .local/bin/ifinstalled | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to '.local/bin/ifinstalled') diff --git a/.local/bin/ifinstalled b/.local/bin/ifinstalled index 7a53b18..ff36466 100755 --- a/.local/bin/ifinstalled +++ b/.local/bin/ifinstalled @@ -5,9 +5,7 @@ # it informs the user that they need that command to continue. This is used in # various other scripts for clarity's sake. -for x in "$@";do - notify() { notify-send "📦 $x" "must be installed for this function." && exit 1 ;} - which_out="$( /usr/bin/which "$x" >/dev/null 2>&1 )" && exit 0 #you might have compiled the prog, and not install the repo pkg... - pkgname="$(pacman -Qqo "$which_out" >/dev/null 2>&1 )" #...thats why two variables. - pacman -Qq "$pkgname" >/dev/null 2>&1 || notify +for x in "$@"; do + { ! which "$x" >/dev/null 2>&1 && ! pacman -Qq "$x" >/dev/null 2>&1 ;} && + notify-send "📦 $x" "must be installed for this function." && exit 1 ; done -- cgit v1.3.1 From 2ddfa7ab0f2597b26be9872e37d7374b75a72678 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 23 Oct 2021 10:27:45 -0400 Subject: better fix --- .local/bin/ifinstalled | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.local/bin/ifinstalled') diff --git a/.local/bin/ifinstalled b/.local/bin/ifinstalled index ff36466..c192eba 100755 --- a/.local/bin/ifinstalled +++ b/.local/bin/ifinstalled @@ -6,6 +6,7 @@ # various other scripts for clarity's sake. for x in "$@"; do - { ! which "$x" >/dev/null 2>&1 && ! pacman -Qq "$x" >/dev/null 2>&1 ;} && - notify-send "📦 $x" "must be installed for this function." && exit 1 ; + if ! which "$x" >/dev/null 2>&1 && ! pacman -Qq "$x" >/dev/null 2>&1; then + notify-send "📦 $x" "must be installed for this function." && exit 1 ; + fi done -- cgit v1.3.1