From 96a5c0753c05e5cbcb4eff2270a65b6a46c14023 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Mon, 21 Oct 2013 11:22:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=9C=A8=E5=AE=89=E8=A3=85=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E8=87=AA=E5=B7=B1=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E5=AF=86=E7=A0=81=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.php       | 8 +++++++-
 install/Mysql.php | 4 ++--
 tools/Makefile    | 8 ++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/install.php b/install.php
index 7193e7ce..7d05c0ce 100644
--- a/install.php
+++ b/install.php
@@ -328,7 +328,7 @@ list($prefixVersion, $suffixVersion) = explode('/', $currentVersion);
                                         'ip' => '127.0.0.1', 'agent' => $options->generator, 'text' => '欢迎加入 Typecho 大家族', 'type' => 'comment', 'status' => 'approved', 'parent' => 0)));
 
                                         /** 初始用户 */
-                                        $password = substr(uniqid(), 7);
+                                        $password = empty($config['userPassword']) ? substr(uniqid(), 7) : $config['userPassword'];
                                         
                                         $installDb->query($installDb->insert('table.users')->rows(array('name' => $config['userName'], 'password' => Typecho_Common::hash($password), 'mail' => $config['userMail'],
                                         'url' => 'http://www.typecho.org', 'screenName' => $config['userName'], 'group' => 'administrator', 'created' => Typecho_Date::gmtTime())));
@@ -463,6 +463,7 @@ list($prefixVersion, $suffixVersion) = explode('/', $currentVersion);
                                     Typecho_Cookie::set('__typecho_config', base64_encode(serialize(array_merge(array(
                                         'prefix'    =>  _r('dbPrefix'),
                                         'userName'  =>  _r('userName'),
+                                        'userPassword'  =>  _r('userPassword'),
                                         'userMail'  =>  _r('userMail'),
                                         'adapter'   =>  $adapter,
                                         'siteUrl'   =>  _r('userUrl')
@@ -546,6 +547,11 @@ Typecho_Db::set(\$db);
                             <p class="description"><?php _e('请填写您的用户名'); ?></p>
                             </li>
                             <li>
+                            <label class="typecho-label" for="userPassword"><?php _e('登录密码'); ?></label>
+                            <input type="password" name="userPassword" id="userPassword" class="text" value="<?php _v('userPassword'); ?>" />
+                            <p class="description"><?php _e('请填写您的登录密码, 如果留空系统将为您随机生成一个'); ?></p>
+                            </li>
+                            <li>
                             <label class="typecho-label" for="userMail"><?php _e('邮件地址'); ?></label>
                             <input type="text" name="userMail" id="userMail" class="text" value="<?php _v('userMail', 'webmaster@yourdomain.com'); ?>" />
                             <p class="description"><?php _e('请填写一个您的常用邮箱'); ?></p>
diff --git a/install/Mysql.php b/install/Mysql.php
index c947270f..ab872ee2 100644
--- a/install/Mysql.php
+++ b/install/Mysql.php
@@ -21,8 +21,8 @@
 <h3 class="warning"><?php _e('系统将为您自动匹配 %s 环境的安装选项', 'BAE'); ?></h3>
 <li>
 <label class="typecho-label" for="dbDatabase"><?php _e('数据库名'); ?></label>
-<input type="text" class="text" id="dbDatabase" name="dbDatabase" value="<?php _v('dbDatabase', 'typecho'); ?>" />
-<p class="description"><?php _e('请您指定数据库名称'); ?></p>
+<input type="text" class="text" id="dbDatabase" name="dbDatabase" value="<?php _v('dbDatabase'); ?>" />
+<p class="description"><?php _e('可以在MySQL服务的管理页面看到您创建的数据库名称'); ?></p>
 </li>
 <input type="hidden" name="config" value="array (
     'host'      =>  getenv('HTTP_BAE_ENV_ADDR_SQL_IP'),
diff --git a/tools/Makefile b/tools/Makefile
index 347596b7..cd4110ec 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,7 +19,6 @@ update:
 
 package:
 	@echo 'package'
-	rm -Rf build/mockup/
 	rm -Rf build/tools/
 	rm -Rf build/todo.txt
 	rm -Rf build/usr/plugins/*
@@ -62,7 +61,12 @@ install:
 	make update
 	rm -Rf build/tools/
 	rm -Rf build/todo.txt
-	rm -Rf ${DIR}/usr/plugins/*
+	rm -Rf build/usr/plugins/*
+	rm -Rf build/admin/scss
+	rm -Rf build/admin/img/editor
+	rm -Rf build/admin/img/icons
+	mkdir build/usr/uploads/
+	chmod 777 build/usr/uploads/
 	cp -Rf build/* ${DIR}
 	make clear
 

From 7b51354c9de386bda26bf2bdc7f0b62b70aa86ca Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Mon, 21 Oct 2013 11:38:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=BC=95=E6=93=8E=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/install.php b/install.php
index 7d05c0ce..f62f58ff 100644
--- a/install.php
+++ b/install.php
@@ -60,6 +60,19 @@ if (!isset($_GET['finish']) && file_exists(__TYPECHO_ROOT_DIR__ . '/config.inc.p
     exit;
 }
 
+/**
+ * 检测是否为应用引擎 
+ * 
+ * @access protected
+ * @return void
+ */
+function _engine()
+{
+    return !empty($_SERVER['HTTP_APPNAME']) // SAE
+        || !!getenv('HTTP_BAE_ENV_APPID')   // BAE
+        || (isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'],'Google App Engine') !== false) // GAE;
+}
+
 /**
  * 获取传递参数
  *
@@ -483,7 +496,9 @@ list($prefixVersion, $suffixVersion) = explode('/', $currentVersion);
 Typecho_Db::set(\$db);
 ";
                                     $contents = implode('', $lines);
-                                    @file_put_contents('./config.inc.php', $contents);
+                                    if (!_engine()) {
+                                        @file_put_contents('./config.inc.php', $contents);
+                                    }
 
                                     // 创建一个用于标识的临时文件
                                     $_SESSION['typecho'] = 1;

From c7b9b935b85d927e79caf2497cc5fdb3204cf123 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Mon, 21 Oct 2013 11:46:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.php b/install.php
index f62f58ff..bce78272 100644
--- a/install.php
+++ b/install.php
@@ -70,7 +70,7 @@ function _engine()
 {
     return !empty($_SERVER['HTTP_APPNAME']) // SAE
         || !!getenv('HTTP_BAE_ENV_APPID')   // BAE
-        || (isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'],'Google App Engine') !== false) // GAE;
+        || (isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'],'Google App Engine') !== false); // GAE
 }
 
 /**