Merge branch 'master' of github.com:dgiot/dgiot

dgiot_install.sh

@@ -150,6 +150,7 @@ function pre_install() {
  echo -e "$(date +%F_%T) $LINENO: ${GREEN} installing tools${NC}"
  yum -y install vim net-tools wget ntpdate &>/dev/null
  yum -y groupinstall "Development Tools" &>/dev/null
+ yum install -y wget git &>/dev/null
 
  ## 1.7 时间同步
  echo "*/10 * * * * /usr/sbin/ntpdate ntp.aliyun.com > /dev/null 2>&1" >>/etc/crontab
@@ -386,8 +387,6 @@ set_host() {
 ### 2.1.1 环境准备，根据自身需要，减少或者增加
 function yum_install_postgres() {
  echo -e "$(date +%F_%T) $LINENO: ${GREEN} yum install postgres${NC}"
- #yum_install_git #占用资源较多，先去除
- yum install -y wget git &>/dev/null
  ${csudo} yum install -y gcc gcc-c++ epel-release &>/dev/null
  # ${csudo} yum install -y llvm llvm-devel &> /dev/null
  ${csudo} yum install -y clang libicu-devel perl-ExtUtils-Embed &>/dev/null