Browse Source

Fixed sudo dependencies

old-stable
gau1991 10 years ago
parent
commit
de4b5a7e4c
  1. 10
      bin/install
  2. 2
      src/modules/stack/install/ee_mod_repo_mysql.sh

10
bin/install

@ -70,7 +70,7 @@ function ee_lib_error()
function ee_lib_package_check()
{
local ee_package
for ee_package in $@;do
dpkg --get-selections | grep -v deinstall | grep $ee_package &>> $EE_INSTALL_LOG
@ -87,7 +87,7 @@ function ee_lib_package_check()
if [ ! -d $EE_LOG_DIR ]; then
ee_lib_echo "Creating EasyEngine (ee) log directory, please wait..."
mkdir -p $EE_LOG_DIR || ee_lib_error "Unable to create log directory $EE_LOG_DIR, exit status = " $?
# Create EasyEngine log files
touch /var/log/easyengine/{ee.log,install.log,update.log,error.log} \
|| ee_lib_error "Unable to create EasyEngine log files in $EE_LOG_DIR, exit status = " $?
@ -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 ] || [ -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/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 $EE_PACKAGE_NAME | tee -ai $EE_INSTALL_LOG\
apt-get -y install coreutils ed bc wget curl tar git-core sudo $EE_PACKAGE_NAME | tee -ai $EE_INSTALL_LOG\
|| ee_lib_error "Unable to install required packages, exit status = " $?
fi
@ -130,7 +130,7 @@ else
fi
fi
# Remove old version of EasyEngine (ee)
# Remove old version of EasyEngine (ee)
rm -rf /tmp/easyengine &>> /dev/null
# Let's clone EasyEngine (ee)

2
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 = " $?
}

Loading…
Cancel
Save