From ffb3451e658353086dd45f7623391dbde1447a14 Mon Sep 17 00:00:00 2001 From: gau1991 Date: Wed, 12 Nov 2014 12:03:24 +0530 Subject: [PATCH] Improved sudo dependencies --- bin/install | 4 ++-- src/modules/stack/install/ee_mod_repo_mysql.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/install b/bin/install index 08875504..7b2ca1d5 100644 --- a/bin/install +++ b/bin/install @@ -105,9 +105,9 @@ elif [ "$EE_LINUX_DISTRO" == "Debian" ]; then ee_lib_package_check graphviz python-software-properties fi -if [ ! -x /usr/bin/tee ] || [ ! -x /bin/ed ] || [ ! -x /usr/bin/bc ] || [ ! -x /usr/bin/wget ] || [ ! -x /usr/bin/curl ] || [ ! -x /bin/tar ] || [ ! -x /usr/bin/git ] || [ ! -x /usr/bin/pv ] || [ ! -x /usr/bin/lftp ] || [ ! -x /usr/bin/sshpass ] || [ -n "$EE_PACKAGE_NAME" ]; then +if [ ! -x /usr/bin/tee ] || [ ! -x /bin/ed ] || [ ! -x /usr/bin/bc ] || [ ! -x /usr/bin/wget ] || [ ! -x /usr/bin/curl ] || [ ! -x /bin/tar ] || [ ! -x /usr/bin/git ] || [ ! -x /usr/bin/pv ] || [ ! -x /usr/bin/lftp ] || [ ! -x /usr/bin/sshpass ] || [ ! -x /usr/bin/sudo ] || [ -n "$EE_PACKAGE_NAME" ]; then ee_lib_echo "Installing required packages, please wait..." | tee -ai $EE_INSTALL_LOG - apt-get -y install coreutils ed bc wget curl tar git-core lftp pv sshpass $EE_PACKAGE_NAME | tee -ai $EE_INSTALL_LOG\ + apt-get -y install coreutils ed bc wget curl tar git-core lftp pv sshpass sudo $EE_PACKAGE_NAME | tee -ai $EE_INSTALL_LOG\ || ee_lib_error "Unable to install required packages, exit status = " $? fi diff --git a/src/modules/stack/install/ee_mod_repo_mysql.sh b/src/modules/stack/install/ee_mod_repo_mysql.sh index 19542291..116f5d99 100644 --- a/src/modules/stack/install/ee_mod_repo_mysql.sh +++ b/src/modules/stack/install/ee_mod_repo_mysql.sh @@ -9,6 +9,6 @@ function ee_mod_repo_mysql() # Fetch and install Percona GnuPG key gpg --keyserver hkp://keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A &>> $EE_COMMAND_LOG && \ - gpg -a --export CD2EFD2A | sudo apt-key add - &>> $EE_COMMAND_LOG \ + gpg -a --export CD2EFD2A | apt-key add - &>> $EE_COMMAND_LOG \ || ee_lib_error "Unable to add Percona GnuPG key, exit status = " $? }