From a6d3be1b704a13d9a7642127ce5da476a0928eac Mon Sep 17 00:00:00 2001 From: Mitesh Shah Date: Mon, 16 Jun 2014 16:00:52 +0530 Subject: [PATCH] Minor fix --- bin/install.sh | 2 +- src/modules/system/install/ee_mod_install_mysql.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/install.sh b/bin/install.sh index fa9661f4..a44c2081 100644 --- a/bin/install.sh +++ b/bin/install.sh @@ -88,7 +88,7 @@ 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 ] || [ -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\ || ee_lib_error "Unable to install required packages, exit status = " $? diff --git a/src/modules/system/install/ee_mod_install_mysql.sh b/src/modules/system/install/ee_mod_install_mysql.sh index 36f5ef4f..95798a67 100644 --- a/src/modules/system/install/ee_mod_install_mysql.sh +++ b/src/modules/system/install/ee_mod_install_mysql.sh @@ -7,7 +7,7 @@ ee_mod_install_mysql() # If MySQL is not installed # Then set random MySQL password for root user - if [ -n $EE_PACKAGE_NAME ]; then + if [ -n "$EE_PACKAGE_NAME" ]; then # Setting up MySQL password local ee_mysql_auto_pass=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 15 | head -n1)