diff --git a/install/install.py b/install/install.py index 6bf21b649f75f24855b127a36b3f0325e8a7d63e..2200ad3e2336a649a670f099a75c8c90dc0af94f 100755 --- a/install/install.py +++ b/install/install.py @@ -93,7 +93,7 @@ class PreSetup(object): def _setup_mysql(self): color_print('开始安装设置mysql (请手动设置mysql安全)', 'green') - color_print('默认用户å: %s 密ç 密ç : %s' % (self.db_user, self.db_pass), 'green') + color_print('默认用户å: %s 默认密ç : %s' % (self.db_user, self.db_pass), 'green') bash('yum -y install mysql-server') bash('service mysqld start') bash('mysql -e "create database %s default charset=utf8"' % self.db) @@ -152,8 +152,8 @@ class PreSetup(object): def _input_mysql(self): while True: - mysql = raw_input('是å¦ä½¿ç”¨å·²ç»å˜åœ¨çš„æ•°æ®åº“æœåС噍? (y/n) [n]: ') - if mysql != 'y': + mysql = raw_input('是å¦å®‰è£…æ–°çš„MySQLæœåС噍? (y/n) [y]: ') + if mysql != 'n': self._setup_mysql() else: db_host = raw_input('请输入数æ®åº“æœåС噍IP [127.0.0.1]: ') @@ -176,11 +176,11 @@ class PreSetup(object): def _input_smtp(self): while True: self.mail_host = raw_input('请输入SMTP地å€: ').strip() - mail_port = int(raw_input('请输入SMTPç«¯å£ [25]: ').strip()) + mail_port = raw_input('请输入SMTPç«¯å£ [25]: ').strip() self.mail_addr = raw_input('请输入账户: ').strip() self.mail_pass = raw_input('请输入密ç : ').strip() - if mail_port: self.mail_port = mail_port + if mail_port: self.mail_port = int(mail_port) if self._test_mail(): color_print('\n\t请登陆邮箱查收邮件, ç„¶åŽç¡®è®¤æ˜¯å¦ç»§ç»å®‰è£…\n', 'green') diff --git a/install/next.py b/install/next.py index ef7319d67ff24c9bedeeb7a8e41d26b3d3123cd9..9c3f1f6523fc362c5aded4f6bfbe4c2dbcf663ce 100755 --- a/install/next.py +++ b/install/next.py @@ -29,6 +29,7 @@ class Setup(object): def _input_admin(self): while True: + print admin_user = raw_input('请输入管ç†å‘˜ç”¨æˆ·å [%s]: ' % self.admin_user).strip() admin_pass = raw_input('请输入管ç†å‘˜å¯†ç : [%s]: ' % self.admin_pass).strip() admin_pass_again = raw_input('è¯·å†æ¬¡è¾“入管ç†å‘˜å¯†ç : [%s]: ' % self.admin_pass).strip()