diff --git a/scripts/install.sh b/scripts/install.sh index e9cf1e8a5..4e34b67e6 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -4,6 +4,8 @@ export PATH # LANG=en_US.UTF-8 is64bit=`getconf LONG_BIT` +{ + if [ -f /etc/motd ];then echo "welcome to mdserver-web panel" > /etc/motd fi @@ -18,8 +20,6 @@ if [ "$EUID" -ne 0 ] exit fi -{ - if [ ${_os} == "Darwin" ]; then OSNAME='macos' elif grep -Eq "openSUSE" /etc/*-release; then @@ -139,5 +139,5 @@ echo -e "Time consumed:\033[32m $outTime \033[0mMinute!" } 1> >(tee mw-install.log) 2>&1 -echo -e "\n\nInstall completed. If error occurs, please contact us with the log file mw-install.log ." +echo -e "\nInstall completed. If error occurs, please contact us with the log file mw-install.log ." echo "安装完毕,如果出现错误,请带上同目录下的安装日志 mw-install.log 联系我们反馈." \ No newline at end of file diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh index c43a34e53..67a8fb20f 100755 --- a/scripts/install_dev.sh +++ b/scripts/install_dev.sh @@ -4,6 +4,12 @@ export PATH # LANG=en_US.UTF-8 is64bit=`getconf LONG_BIT` +echo -e "您正在安装的是\033[31m mdserver-web 测试版\033[0m,非开发测试用途请使用正式版 install.sh !" +echo -e "\nYou are installing\033[31m mdserver-web dev version \033[0m, normally use install.sh for production.\n" +sleep 8 + +{ + if [ -f /etc/motd ];then echo "welcome to mdserver-web panel" > /etc/motd fi @@ -101,3 +107,8 @@ fi endTime=`date +%s` ((outTime=(${endTime}-${startTime})/60)) echo -e "Time consumed:\033[32m $outTime \033[0mMinute!" + +} 1> >(tee mw-install.log) 2>&1 + +echo -e "\nInstall completed. If error occurs, please contact us with the log file mw-install.log ." +echo "安装完毕,如果出现错误,请带上同目录下的安装日志 mw-install.log 联系我们反馈." \ No newline at end of file