From 21c28c8b1cf5b8727ad3c82bb9efc9efd42909ed Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 10 Sep 2019 21:10:27 +0800
Subject: [PATCH] Update policy of checking environment

---
 bootstrap/chkenv.php | 15 +++++----------
 public/index.php     |  8 +-------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/bootstrap/chkenv.php b/bootstrap/chkenv.php
index b479c2df..03c895ea 100644
--- a/bootstrap/chkenv.php
+++ b/bootstrap/chkenv.php
@@ -45,23 +45,18 @@
     foreach ($requirements['write_permission'] as $dir) {
         $realPath = realpath(__DIR__."/../$dir");
 
-        if (! file_exists($realPath)) {
+        if (! is_writable($realPath)) {
             die_with_utf8_encoding(
-                "[Error] The directory < $dir > does not exist <br>".
-                "[错误] 目录 < $dir > 不存在，请在程序根目录下手动创建。"
+                "[Error] The directory '$dir' is not writable. <br>".
+                "[错误] 目录 '$dir' 不可写，请检查该目录的权限。"
             );
         }
 
         if (! is_writable($realPath)) {
             die_with_utf8_encoding(
-                "[Error] The program lacks write permission to directory < $dir > <br>".
-                "[错误] 程序缺少对 < $dir > 目录的写权限，请手动授权。"
+                "[Error] The program lacks write permission to directory '$dir' <br>".
+                "[错误] 程序缺少对 '$dir' 目录的写权限，请手动授权。"
             );
         }
     }
-
-    $autoload = file_get_contents(__DIR__.'/../vendor/autoload.php');
-    $lines = explode("\n", $autoload);
-    $lines[1] = '$GLOBALS["env_checked"] = true;';
-    file_put_contents(__DIR__.'/../vendor/autoload.php', implode("\n", $lines));
 })();
diff --git a/public/index.php b/public/index.php
index b93920ff..9b61d889 100755
--- a/public/index.php
+++ b/public/index.php
@@ -1,17 +1,11 @@
 <?php
 
-/**
- * Entrance of Blessing Skin Server.
- *
- * @author   printempw <h@prinzeugen.net>
- */
 @ini_set('display_errors', 'on');
 
 require __DIR__.'/../bootstrap/autoload.php';
 
-if (! isset($GLOBALS['env_checked'])) {
+if (! file_exists(__DIR__.'/../storage/install.lock')) {
     require __DIR__.'/../bootstrap/chkenv.php';
 }
 
-// Process the request
 require __DIR__.'/../bootstrap/kernel.php';