From 76738a05f7873fc2a237e74860af1a352c3d2f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Juri=C5=A1i=C4=87?= Date: Fri, 8 Dec 2023 10:25:13 +0100 Subject: [PATCH] Updated function check_deps --- devleops/composer/composer-install.sh | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/devleops/composer/composer-install.sh b/devleops/composer/composer-install.sh index 5563dc6..3d432dd 100755 --- a/devleops/composer/composer-install.sh +++ b/devleops/composer/composer-install.sh @@ -32,21 +32,20 @@ choice() { } check_deps() { -for PKG_NAME in "${PKG_DEPS[@]}" - do - if ! [ -x "$(command -v $PKG_NAME)" ]; then - echo "Error: $PKG_NAME is not installed." >&2 - - echo -ne "\nInstall $PKG_NAME ? " - if choice 2>/dev/null; then - echo -ne "\n$APT_INST $PKG_NAME\n" - $APT_INST $PKG_NAME - else - echo -ne "\n\nAbort install script, package $PKG_NAME is required for work composer.\n" - exit 1; +for NAME in "${PKG_DEPS[@]}" + do + dpkg -l $NAME > /dev/null + CODE=$? + if ! [ "$CODE" -ne 1 ]; then + echo -ne "\nInstall $NAME ? " + if choice 2>/dev/null; then + echo -ne "\n$APT_INST $NAME\n" + $APT_INST $NAME + else + echo -ne "\n\nAbort install script, package $NAME is required for work $PKG_NAME.\n" + exit 1; fi - - fi + fi done }