Browse Source

fix strange translations

kaneawk 8 years ago
parent
commit
720aa1a85b

+ 7 - 7
addons.sh

@@ -66,7 +66,7 @@ Restart_PHP() {
 
 # Check succ
 Check_succ() {
-[ -f "`$php_install_dir/bin/php-config --extension-dir`/${PHP_extension}.so" ] && { Restart_PHP; echo;echo "${CSUCCESS}PHP $PHP_extension module install successfully! ${CEND}"; }
+[ -f "`$php_install_dir/bin/php-config --extension-dir`/${PHP_extension}.so" ] && { Restart_PHP; echo;echo "${CSUCCESS}PHP $PHP_extension module installed successfully! ${CEND}"; }
 }
 
 # Uninstall succ
@@ -122,13 +122,13 @@ src_url=https://dl.eff.org/certbot-auto && Download_src
 /bin/mv certbot-auto /usr/local/bin/
 chmod +x /usr/local/bin/certbot-auto
 certbot-auto -n --help all
-certbot-auto -h | grep '\-\-standalone' > /dev/null && echo; echo "${CSUCCESS}Let's Encrypt client install successfully! ${CEND}"
+certbot-auto -h | grep '\-\-standalone' > /dev/null && echo; echo "${CSUCCESS}Let's Encrypt client installed successfully! ${CEND}"
 }
 
 Uninstall_letsencrypt() {
 rm -rf /usr/local/bin/cerbot-auto /etc/letsencrypt /var/log/letsencrypt
 [ "$OS" == 'CentOS' ] && Cron_file=/var/spool/cron/root || Cron_file=/var/spool/cron/crontabs/root
-sed -i '/certbot-auto/d' $Cron_file 
+sed -i '/certbot-auto/d' $Cron_file
 echo; echo "${CMSG}Let's Encrypt client uninstall completed${CEND}";
 }
 
@@ -154,7 +154,7 @@ What Are You Doing?
 \t${CMSG}1${CEND}. Install/Uninstall PHP opcode cache
 \t${CMSG}2${CEND}. Install/Uninstall ZendGuardLoader/ionCube PHP Extension
 \t${CMSG}3${CEND}. Install/Uninstall ImageMagick/GraphicsMagick PHP Extension
-\t${CMSG}4${CEND}. Install/Uninstall fileinfo PHP Extension 
+\t${CMSG}4${CEND}. Install/Uninstall fileinfo PHP Extension
 \t${CMSG}5${CEND}. Install/Uninstall memcached/memcache
 \t${CMSG}6${CEND}. Install/Uninstall Redis
 \t${CMSG}7${CEND}. Install/Uninstall Let's Encrypt client
@@ -194,7 +194,7 @@ What Are You Doing?
                         cd $oneinstack_dir/src
                         if [[ $PHP_version =~ ^5.[3-4]$ ]];then
                             Install_ZendOPcache
-                        elif [ "$PHP_version" == '5.5' ];then 
+                        elif [ "$PHP_version" == '5.5' ];then
                             src_url=http://www.php.net/distributions/php-$php_5_version.tar.gz && Download_src
                             tar xzf php-$php_5_version.tar.gz
                             cd php-$php_5_version/ext/opcache
@@ -273,7 +273,7 @@ What Are You Doing?
                         fi
                     elif [ $Loader = 2 ];then
                         Install_ionCube
-                        Restart_PHP; echo "${CSUCCESS}PHP $PHP_extension module install successfully! ${CEND}";
+                        Restart_PHP; echo "${CSUCCESS}PHP $PHP_extension module installed successfully! ${CEND}";
                     fi
                 else
                     echo; echo "${CWARNING}Your php does not support $PHP_extension! ${CEND}";
@@ -367,7 +367,7 @@ What Are You Doing?
                     Install_php-memcache
                     PHP_extension=memcached && Check_PHP_Extension
                     Install_php-memcached
-                    [ -f "`$php_install_dir/bin/php-config --extension-dir`/memcache.so" -a "`$php_install_dir/bin/php-config --extension-dir`/memcached.so" ] && { Restart_PHP; echo;echo "${CSUCCESS}PHP memcache/memcached module install successfully! ${CEND}"; }
+                    [ -f "`$php_install_dir/bin/php-config --extension-dir`/memcache.so" -a "`$php_install_dir/bin/php-config --extension-dir`/memcached.so" ] && { Restart_PHP; echo;echo "${CSUCCESS}PHP memcache/memcached module installed successfully! ${CEND}"; }
                 fi
             else
                 PHP_extension=memcache && Uninstall_succ

+ 1 - 1
config/index.html

@@ -21,7 +21,7 @@ font-family:"Microsoft YaHei",sans-serif;
 <body>
 <div id="main">
 <br>
-<div align="center"><h2>Congratulations, OneinStack a successful installation!</h2></div>
+<div align="center"><h2>Congratulations, OneinStack installed successfully!</h2></div>
 <h3><a href="https://oneinstack.com" target="_blank" class="links">OneinStack </a><a href="http://www.linuxeye.com/" target="_blank">Linux</a>+Nginx/Tengine+MySQL/MariaDB/Percona</br>+PHP+Pureftpd+phpMyAdmin+redis+memcached+jemalloc/tcmalloc.</h3>
 <p><b>Check environment:&nbsp;&nbsp;</b><a href="/proberv.php" target="_blank" class="links">Proberv</a>&nbsp;<a href="/phpinfo.php" target="_blank" class="links">phpinfo</a>&nbsp;<a href="/ocp.php" target="_blank" class="links">Opcache</a>&nbsp;<a href="/phpMyAdmin/" target="_blank" class="links">phpMyAdmin</a></p>
 <p><b>Create Web virtual running script:</b>&nbsp;&nbsp;<font color="#008000">./vhost.sh</font></p>

+ 9 - 9
config/index_cn.html

@@ -21,19 +21,19 @@ font-family:微软雅黑,sans-serif;
 <body>
 <div id="main">
 <br>
-<div align="center"><h2>Congratulations, OneinStack安装成功!</h2></div>
-<h3><a href="https://oneinstack.com" target="_blank" class="links">OneinStack </a> <a href="http://www.linuxeye.com/" target="_blank">Linux</a>+Nginx/Tengine+MySQL/MariaDB/Percona+PHP</br>+Pureftpd+phpMyAdmin+redis+memcached+jemalloc/tcmalloc. 脚本中用到的软件包大多最新稳定版本,修复了一些安全性问题。</h3>
-<p><b>查看本地环境:</b>&nbsp;&nbsp;<a href="/tz.php" target="_blank" class="links">探针</a>&nbsp;<a href="/phpinfo.php" target="_blank" class="links">phpinfo</a>&nbsp;<a href="/ocp.php" target="_blank" class="links">Opcache</a>&nbsp;<a href="/phpMyAdmin/" target="_blank" class="links">phpMyAdmin</a>(为了更安全,建议phpMyAdmin目录重命名!)</p>
-<p><b>创建WEB虚拟主机执行脚本:</b>&nbsp;&nbsp;<font color="#008000">./vhost.sh</font></p>
-<p><b>创建FTP虚拟账号执行脚本:</b>&nbsp;&nbsp;<font color="#008000">./pureftpd_vhost.sh</font></p>
-<p><b>Github项目地址:</b>&nbsp;&nbsp;<a target="_blank" class="links" href="https://github.com/lj2007331/oneinstack">https://github.com/lj2007331/oneinstack</a></p>
-<p><b>OneinStack官网:</b>&nbsp;&nbsp;<a target="_blank" class="links" href="https://oneinstack.com">https://oneinstack.com</a></p>
-<p><b>QQ群:</b>&nbsp;&nbsp;558540514(付费千人群) 556824757(新) 213014293(满) 486321919(满) 438311066(满) 235258658(满)</p>
+<div align="center"><h2>恭喜您,OneinStack 安装成功!</h2></div>
+<h3><a href="https://oneinstack.com" target="_blank" class="links">OneinStack </a> <a href="http://www.linuxeye.com/" target="_blank">Linux</a>+Nginx/Tengine+MySQL/MariaDB/Percona+PHP</br>+Pureftpd+phpMyAdmin+redis+memcached+jemalloc/tcmalloc 脚本中用到的软件包大多最新稳定版本,修复了一些安全性问题。</h3>
+<p><b>查看本地环境:</b>&nbsp;&nbsp;<a href="/tz.php" target="_blank" class="links">探针</a>&nbsp;<a href="/phpinfo.php" target="_blank" class="links">phpinfo</a>&nbsp;<a href="/ocp.php" target="_blank" class="links">Opcache</a>&nbsp;<a href="/phpMyAdmin/" target="_blank" class="links">phpMyAdmin</a>(为了更安全,建议重命名 phpMyAdmin 目录!)</p>
+<p><b>创建 WEB 虚拟主机执行脚本:</b>&nbsp;&nbsp;<font color="#008000">./vhost.sh</font></p>
+<p><b>创建 FTP 虚拟账号执行脚本:</b>&nbsp;&nbsp;<font color="#008000">./pureftpd_vhost.sh</font></p>
+<p><b>Github 项目地址:</b>&nbsp;&nbsp;<a target="_blank" class="links" href="https://github.com/lj2007331/oneinstack">https://github.com/lj2007331/oneinstack</a></p>
+<p><b>OneinStack 官网:</b>&nbsp;&nbsp;<a target="_blank" class="links" href="https://oneinstack.com">https://oneinstack.com</a></p>
+<p><b>QQ 群:</b>&nbsp;&nbsp;558540514(付费千人群) 556824757(新) 213014293(满) 486321919(满) 438311066(满) 235258658(满)</p>
 <p><b>赞助我们:</b></p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;支付宝:&nbsp;&nbsp;lj2007331@gmail.com</p>
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PayPal:&nbsp;&nbsp;lj2007331@gmail.com</p>
 <div align="center"><iframe src="https://blog.linuxeye.com/ad_buttom.html" width="475" frameborder="0" scrolling="no"></iframe></div>
-<div align="center"><h3><a href="https://oneinstack.com" target="_blank">OneinStack</a> by <a href="https://blog.linuxeye.com/" target="_blank">Linux运维笔记</a></h3></div>
+<div align="center"><h3><a href="https://oneinstack.com" target="_blank">OneinStack</a> by <a href="https://blog.linuxeye.com/" target="_blank">Linux 运维笔记</a></h3></div>
 </div>
 </body>
 </html>

+ 1 - 1
include/ZendGuardLoader.sh

@@ -82,7 +82,7 @@ zend_loader.enable=1
 zend_loader.disable_licensing=0
 zend_loader.obfuscation_level_support=3
 EOF
-    echo "${CSUCCESS}PHP ZendGuardLoader module install successfully! ${CEND}"
+    echo "${CSUCCESS}PHP ZendGuardLoader module installed successfully! ${CEND}"
     [ "$Apache_version" != '1' -a "$Apache_version" != '2' ] && service php-fpm restart || service httpd restart
 else
     echo "${CFAILURE}PHP ZendGuardLoader module install failed, Please contact the author! ${CEND}"

+ 1 - 1
include/apache-2.2.sh

@@ -22,7 +22,7 @@ cd httpd-$apache_2_version
 ./configure --prefix=$apache_install_dir --enable-headers --enable-deflate --enable-mime-magic --enable-so --enable-rewrite --enable-ssl --with-ssl --enable-expires --enable-static-support --enable-suexec --disable-userdir --with-included-apr --with-mpm=$MPM --disable-userdir
 make -j ${THREAD} && make install
 if [ -e "$apache_install_dir/conf/httpd.conf" ];then
-    echo "${CSUCCESS}Apache install successfully! ${CEND}"
+    echo "${CSUCCESS}Apache installed successfully! ${CEND}"
     cd ..
     rm -rf httpd-$apache_2_version
 else

+ 1 - 1
include/apache-2.4.sh

@@ -35,7 +35,7 @@ cd httpd-$apache_4_version
 ./configure --prefix=$apache_install_dir --enable-headers --enable-deflate --enable-mime-magic --enable-so --enable-rewrite --enable-ssl --with-ssl --enable-expires --enable-static-support --enable-suexec --disable-userdir --with-included-apr --with-mpm=$MPM --disable-userdir
 make -j ${THREAD} && make install
 if [ -e "$apache_install_dir/conf/httpd.conf" ];then
-    echo "${CSUCCESS}Apache install successfully! ${CEND}"
+    echo "${CSUCCESS}Apache installed successfully! ${CEND}"
     cd ..
     rm -rf httpd-$apache_4_version
 else

+ 1 - 1
include/apcu.sh

@@ -29,7 +29,7 @@ apc.enable_cli=1
 EOF
     [ "$Apache_version" != '1' -a "$Apache_version" != '2' ] && service php-fpm restart || service httpd restart
     /bin/cp apc.php $wwwroot_dir/default
-    echo "${CSUCCESS}APCU module install successfully! ${CEND}"
+    echo "${CSUCCESS}APCU module installed successfully! ${CEND}"
     cd ..
     rm -rf apcu-$apcu_version
 else

+ 1 - 1
include/eaccelerator-0.9.sh

@@ -41,7 +41,7 @@ eaccelerator.keys=disk_only
 eaccelerator.sessions=disk_only
 eaccelerator.content=disk_only
 EOF
-    echo "${CSUCCESS}Accelerator module install successfully! ${CEND}"
+    echo "${CSUCCESS}Accelerator module installed successfully! ${CEND}"
     cd ..
     [ -z "`grep 'kernel.shmmax = 67108864' /etc/sysctl.conf`" ] && echo 'kernel.shmmax = 67108864' >> /etc/sysctl.conf
     sysctl -p

+ 1 - 1
include/eaccelerator-1.0-dev.sh

@@ -41,7 +41,7 @@ eaccelerator.keys=disk_only
 eaccelerator.sessions=disk_only
 eaccelerator.content=disk_only
 EOF
-    echo "${CSUCCESS}Accelerator module install successfully! ${CEND}"
+    echo "${CSUCCESS}Accelerator module installed successfully! ${CEND}"
     cd ..
     [ -z "`grep 'kernel.shmmax = 67108864' /etc/sysctl.conf`" ] && echo 'kernel.shmmax = 67108864' >> /etc/sysctl.conf
     sysctl -p

+ 1 - 1
include/jdk-1.6.sh

@@ -30,7 +30,7 @@ if [ -d "$JDK_NAME" ];then
     [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
     [ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
     . /etc/profile
-    echo "${CSUCCESS}$JDK_NAME install successfully! ${CEND}"
+    echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
 else
     rm -rf $JAVA_dir
     echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"

+ 1 - 1
include/jdk-1.7.sh

@@ -29,7 +29,7 @@ if [ -d "$JDK_NAME" ];then
     [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
     [ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
     . /etc/profile
-    echo "${CSUCCESS}$JDK_NAME install successfully! ${CEND}"
+    echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
 else
     rm -rf $JAVA_dir
     echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"

+ 1 - 1
include/jdk-1.8.sh

@@ -29,7 +29,7 @@ if [ -d "$JDK_NAME" ];then
     [ -n "`grep ^'export PATH=' /etc/profile`" -a -z "`grep '$JAVA_HOME/bin' /etc/profile`" ] && sed -i "s@^export PATH=\(.*\)@export PATH=\$JAVA_HOME/bin:\1@" /etc/profile
     [ -z "`grep ^'export PATH=' /etc/profile | grep '$JAVA_HOME/bin'`" ] && echo 'export PATH=$JAVA_HOME/bin:$PATH' >> /etc/profile
     . /etc/profile
-    echo "${CSUCCESS}$JDK_NAME install successfully! ${CEND}"
+    echo "${CSUCCESS}$JDK_NAME installed successfully! ${CEND}"
 else
     rm -rf $JAVA_dir
     echo "${CFAILURE}JDK install failed, Please contact the author! ${CEND}"

+ 1 - 1
include/jemalloc.sh

@@ -24,7 +24,7 @@ if [ -f "/usr/local/lib/libjemalloc.so" ];then
     fi
     echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
     ldconfig
-    echo "${CSUCCESS}jemalloc module install successfully! ${CEND}"
+    echo "${CSUCCESS}jemalloc module installed successfully! ${CEND}"
     cd ..
     rm -rf jemalloc-$jemalloc_version
 else

+ 1 - 1
include/mariadb-10.0.sh

@@ -33,7 +33,7 @@ elif [ "$je_tc_malloc" == '2' ];then
 fi
 
 if [ -d "$mariadb_install_dir/support-files" ];then
-    echo "${CSUCCESS}MariaDB install successfully! ${CEND}"
+    echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
 else
     rm -rf $mariadb_install_dir
     echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}"

+ 1 - 1
include/mariadb-10.1.sh

@@ -33,7 +33,7 @@ elif [ "$je_tc_malloc" == '2' ];then
 fi
 
 if [ -d "$mariadb_install_dir/support-files" ];then
-    echo "${CSUCCESS}MariaDB install successfully! ${CEND}"
+    echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
 else
     rm -rf $mariadb_install_dir
     echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}"

+ 1 - 1
include/mariadb-5.5.sh

@@ -33,7 +33,7 @@ elif [ "$je_tc_malloc" == '2' ];then
 fi
 
 if [ -d "$mariadb_install_dir/support-files" ];then
-    echo "${CSUCCESS}MariaDB install successfully! ${CEND}"
+    echo "${CSUCCESS}MariaDB installed successfully! ${CEND}"
 else
     rm -rf $mariadb_install_dir
     echo "${CFAILURE}MariaDB install failed, Please contact the author! ${CEND}"

+ 3 - 3
include/memcached.sh

@@ -22,7 +22,7 @@ cd memcached-$memcached_version
 ./configure --prefix=$memcached_install_dir
 make -j ${THREAD} && make install
 if [ -d "$memcached_install_dir/include/memcached" ];then
-    echo "${CSUCCESS}memcached install successfully! ${CEND}"
+    echo "${CSUCCESS}memcached installed successfully! ${CEND}"
     cd ..
     rm -rf memcached-$memcached_version
     ln -s $memcached_install_dir/bin/memcached /usr/bin/memcached
@@ -64,7 +64,7 @@ if [ -e "$php_install_dir/bin/phpize" ];then
 extension=memcache.so
 EOF
         [ "$Apache_version" != '1' -a "$Apache_version" != '2' ] && service php-fpm restart || service httpd restart
-        echo "${CSUCCESS}PHP memcache module install successfully! ${CEND}"
+        echo "${CSUCCESS}PHP memcache module installed successfully! ${CEND}"
         cd ..
         rm -rf memcache-$memcache_pecl_version
     else
@@ -108,7 +108,7 @@ if [ -e "$php_install_dir/bin/phpize" ];then
 extension=memcached.so
 memcached.use_sasl=1
 EOF
-        echo "${CSUCCESS}PHP memcached module install successfully! ${CEND}"
+        echo "${CSUCCESS}PHP memcached module installed successfully! ${CEND}"
         cd ..
         rm -rf memcached-$memcached_pecl_version
         [ "$Apache_version" != '1' -a "$Apache_version" != '2' ] && service php-fpm restart || service httpd restart

+ 1 - 1
include/mysql-5.5.sh

@@ -34,7 +34,7 @@ elif [ "$je_tc_malloc" == '2' ];then
 fi
 
 if [ -d "$mysql_install_dir/support-files" ];then
-    echo "${CSUCCESS}MySQL install successfully! ${CEND}"
+    echo "${CSUCCESS}MySQL installed successfully! ${CEND}"
     cd ..
     rm -rf mysql-$mysql_5_6_version
 else

+ 1 - 1
include/mysql-5.6.sh

@@ -34,7 +34,7 @@ elif [ "$je_tc_malloc" == '2' ];then
 fi
 
 if [ -d "$mysql_install_dir/support-files" ];then
-    echo "${CSUCCESS}MySQL install successfully! ${CEND}"
+    echo "${CSUCCESS}MySQL installed successfully! ${CEND}"
     cd ..
     rm -rf mysql-$mysql_5_6_version
 else

+ 1 - 1
include/mysql-5.7.sh

@@ -34,7 +34,7 @@ elif [ "$je_tc_malloc" == '2' ];then
 fi
 
 if [ -d "$mysql_install_dir/support-files" ];then
-    echo "${CSUCCESS}MySQL install successfully! ${CEND}"
+    echo "${CSUCCESS}MySQL installed successfully! ${CEND}"
     cd ..
     rm -rf mysql-$mysql_5_7_version
 else

+ 1 - 1
include/nginx.sh

@@ -43,7 +43,7 @@ make -j ${THREAD} && make install
 if [ -e "$nginx_install_dir/conf/nginx.conf" ];then
     cd ..
     rm -rf nginx-$nginx_version
-    echo "${CSUCCESS}Nginx install successfully! ${CEND}"
+    echo "${CSUCCESS}Nginx installed successfully! ${CEND}"
 else
     rm -rf $nginx_install_dir
     echo "${CFAILURE}Nginx install failed, Please Contact the author! ${CEND}"

+ 1 - 1
include/openresty.sh

@@ -40,7 +40,7 @@ make -j ${THREAD} && make install
 if [ -e "$openresty_install_dir/nginx/conf/nginx.conf" ];then
     cd ..
     rm -rf openresty-$openresty_version
-    echo "${CSUCCESS}OpenResty install successfully! ${CEND}"
+    echo "${CSUCCESS}OpenResty installed successfully! ${CEND}"
 else
     rm -rf $openresty_install_dir
     echo "${CFAILURE}OpenResty install failed, Please Contact the author! ${CEND}"

+ 1 - 1
include/percona-5.5.sh

@@ -44,7 +44,7 @@ make -j ${THREAD}
 make install
 
 if [ -d "$percona_install_dir/support-files" ];then
-    echo "${CSUCCESS}Percona install successfully! ${CEND}"
+    echo "${CSUCCESS}Percona installed successfully! ${CEND}"
     cd ..
     rm -rf percona-server-$percona_5_5_version
 else

+ 1 - 1
include/percona-5.6.sh

@@ -43,7 +43,7 @@ make -j ${THREAD}
 make install
 
 if [ -d "$percona_install_dir/support-files" ];then
-    echo "${CSUCCESS}Percona install successfully! ${CEND}"
+    echo "${CSUCCESS}Percona installed successfully! ${CEND}"
     cd ..
     rm -rf percona-server-$percona_5_6_version
 else

+ 1 - 1
include/percona-5.7.sh

@@ -58,7 +58,7 @@ make -j ${THREAD}
 make install
 
 if [ -d "$percona_install_dir/support-files" ];then
-    echo "${CSUCCESS}Percona install successfully! ${CEND}"
+    echo "${CSUCCESS}Percona installed successfully! ${CEND}"
     cd ..
     rm -rf percona-server-$percona_5_7_version
 else

+ 1 - 1
include/php-5.3.sh

@@ -129,7 +129,7 @@ make ZEND_EXTRA_LIBS='-liconv'
 make install
 
 if [ -e "$php_install_dir/bin/phpize" ];then
-    echo "${CSUCCESS}PHP install successfully! ${CEND}"
+    echo "${CSUCCESS}PHP installed successfully! ${CEND}"
 else
     rm -rf $php_install_dir
     echo "${CFAILURE}PHP install failed, Please Contact the author! ${CEND}"

+ 1 - 1
include/php-5.4.sh

@@ -91,7 +91,7 @@ make ZEND_EXTRA_LIBS='-liconv'
 make install
 
 if [ -e "$php_install_dir/bin/phpize" ];then
-    echo "${CSUCCESS}PHP install successfully! ${CEND}"
+    echo "${CSUCCESS}PHP installed successfully! ${CEND}"
 else
     rm -rf $php_install_dir
     echo "${CFAILURE}PHP install failed, Please Contact the author! ${CEND}"

+ 1 - 1
include/php-5.5.sh

@@ -91,7 +91,7 @@ make ZEND_EXTRA_LIBS='-liconv'
 make install
 
 if [ -e "$php_install_dir/bin/phpize" ];then
-    echo "${CSUCCESS}PHP install successfully! ${CEND}"
+    echo "${CSUCCESS}PHP installed successfully! ${CEND}"
 else
     rm -rf $php_install_dir
     echo "${CFAILURE}PHP install failed, Please Contact the author! ${CEND}"

+ 1 - 1
include/php-5.6.sh

@@ -90,7 +90,7 @@ make ZEND_EXTRA_LIBS='-liconv'
 make install
 
 if [ -e "$php_install_dir/bin/phpize" ];then
-    echo "${CSUCCESS}PHP install successfully! ${CEND}"
+    echo "${CSUCCESS}PHP installed successfully! ${CEND}"
 else
     rm -rf $php_install_dir
     echo "${CFAILURE}PHP install failed, Please Contact the author! ${CEND}"

+ 1 - 1
include/php-7.sh

@@ -91,7 +91,7 @@ make ZEND_EXTRA_LIBS='-liconv'
 make install
 
 if [ -e "$php_install_dir/bin/phpize" ];then
-    echo "${CSUCCESS}PHP install successfully! ${CEND}"
+    echo "${CSUCCESS}PHP installed successfully! ${CEND}"
 else
     rm -rf $php_install_dir
     echo "${CFAILURE}PHP install failed, Please Contact the author! ${CEND}"

+ 1 - 1
include/pureftpd.sh

@@ -22,7 +22,7 @@ cd pure-ftpd-$pureftpd_version
 ./configure --prefix=$pureftpd_install_dir CFLAGS=-O2 --with-puredb --with-quotas --with-cookie --with-virtualhosts --with-virtualchroot --with-diraliases --with-sysquotas --with-ratios --with-altlog --with-paranoidmsg --with-shadow --with-welcomemsg  --with-throttling --with-uploadscript --with-language=english --with-rfc2640
 make -j ${THREAD} && make install
 if [ -e "$pureftpd_install_dir/sbin/pure-ftpwho" ];then
-    echo "${CSUCCESS}Pure-Ftp install successfully! ${CEND}"
+    echo "${CSUCCESS}Pure-Ftp installed successfully! ${CEND}"
     [ ! -e "$pureftpd_install_dir/etc" ] && mkdir $pureftpd_install_dir/etc
     cp configuration-file/pure-config.pl $pureftpd_install_dir/sbin
     sed -i "s@/usr/local/pureftpd@$pureftpd_install_dir@" $pureftpd_install_dir/sbin/pure-config.pl

+ 3 - 3
include/redis.sh

@@ -33,11 +33,11 @@ if [ -f "src/redis-server" ];then
     sed -i "s@^# bind 127.0.0.1@bind 127.0.0.1@" $redis_install_dir/etc/redis.conf
     redis_maxmemory=`expr $Mem / 8`000000
     [ -z "`grep ^maxmemory $redis_install_dir/etc/redis.conf`" ] && sed -i "s@maxmemory <bytes>@maxmemory <bytes>\nmaxmemory `expr $Mem / 8`000000@" $redis_install_dir/etc/redis.conf
-    echo "${CSUCCESS}Redis-server install successfully! ${CEND}"
+    echo "${CSUCCESS}Redis-server installed successfully! ${CEND}"
     cd ..
     rm -rf redis-$redis_version
     id -u redis >/dev/null 2>&1
-    [ $? -ne 0 ] && useradd -M -s /sbin/nologin redis 
+    [ $? -ne 0 ] && useradd -M -s /sbin/nologin redis
     chown -R redis:redis $redis_install_dir/var
     /bin/cp ../init.d/Redis-server-init /etc/init.d/redis-server
     if [ "$OS" == 'CentOS' ];then
@@ -81,7 +81,7 @@ if [ -e "$php_install_dir/bin/phpize" ];then
 [redis]
 extension=redis.so
 EOF
-        echo "${CSUCCESS}PHP Redis module install successfully! ${CEND}"
+        echo "${CSUCCESS}PHP Redis module installed successfully! ${CEND}"
         cd ..
         rm -rf redis-$redis_pecl_version
         [ "$Apache_version" != '1' -a "$Apache_version" != '2' ] && service php-fpm restart || service httpd restart

+ 1 - 1
include/tcmalloc.sh

@@ -20,7 +20,7 @@ make -j ${THREAD} && make install
 if [ -f "/usr/local/lib/libtcmalloc.so" ];then
     echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf
     ldconfig
-    echo "${CSUCCESS}tcmalloc module install successfully! ${CEND}"
+    echo "${CSUCCESS}tcmalloc module installed successfully! ${CEND}"
     cd ..
     rm -rf gperftools-$tcmalloc_version
 else

+ 1 - 1
include/tengine.sh

@@ -41,7 +41,7 @@ make -j ${THREAD} && make install
 if [ -e "$tengine_install_dir/conf/nginx.conf" ];then
     cd ..
     rm -rf tengine-$tengine_version
-    echo "${CSUCCESS}Tengine install successfully! ${CEND}"
+    echo "${CSUCCESS}Tengine installed successfully! ${CEND}"
 else
     rm -rf $tengine_install_dir
     echo "${CFAILURE}Tengine install failed, Please Contact the author! ${CEND}"

+ 1 - 1
include/tomcat-6.sh

@@ -111,7 +111,7 @@ EOF
         sed -i "s@^TOMCAT_USER=.*@TOMCAT_USER=$run_user@" /etc/init.d/tomcat
         [ "$OS" == 'CentOS' ] && { chkconfig --add tomcat; chkconfig tomcat on; }
         [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d tomcat defaults
-        echo "${CSUCCESS}Tomcat install successfully! ${CEND}"
+        echo "${CSUCCESS}Tomcat installed successfully! ${CEND}"
     fi
 else
     rm -rf $tomcat_install_dir

+ 1 - 1
include/tomcat-7.sh

@@ -111,7 +111,7 @@ EOF
         sed -i "s@^TOMCAT_USER=.*@TOMCAT_USER=$run_user@" /etc/init.d/tomcat
         [ "$OS" == 'CentOS' ] && { chkconfig --add tomcat; chkconfig tomcat on; }
         [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d tomcat defaults
-        echo "${CSUCCESS}Tomcat install successfully! ${CEND}"
+        echo "${CSUCCESS}Tomcat installed successfully! ${CEND}"
     fi
 else
     rm -rf $tomcat_install_dir

+ 1 - 1
include/tomcat-8.sh

@@ -111,7 +111,7 @@ EOF
         sed -i "s@^TOMCAT_USER=.*@TOMCAT_USER=$run_user@" /etc/init.d/tomcat
         [ "$OS" == 'CentOS' ] && { chkconfig --add tomcat;chkconfig tomcat on; }
         [[ $OS =~ ^Ubuntu$|^Debian$ ]] && update-rc.d tomcat defaults
-        echo "${CSUCCESS}Tomcat install successfully! ${CEND}"
+        echo "${CSUCCESS}Tomcat installed successfully! ${CEND}"
     fi
 else
     rm -rf $tomcat_install_dir

+ 1 - 1
include/xcache.sh

@@ -61,7 +61,7 @@ xcache.coverager = Off
 xcache.coverager_autostart = On
 xcache.coveragedump_directory = ""
 EOF
-    echo "${CSUCCESS}Xcache module install successfully! ${CEND}"
+    echo "${CSUCCESS}Xcache module installed successfully! ${CEND}"
     cd ..
     rm -rf xcache-$xcache_version
     [ "$Apache_version" != '1' -a "$Apache_version" != '2' ] && service php-fpm restart || service httpd restart

+ 1 - 1
include/zendopcache.sh

@@ -33,7 +33,7 @@ opcache.fast_shutdown=1
 opcache.enable_cli=1
 ;opcache.optimization_level=0
 EOF
-    echo "${CSUCCESS}PHP OPcache module install successfully! ${CEND}"
+    echo "${CSUCCESS}PHP OPcache module installed successfully! ${CEND}"
     cd ..
     rm -rf zendopcache-$zendopcache_version
     [ "$Apache_version" != '1' -a "$Apache_version" != '2' ] && service php-fpm restart || service httpd restart