Specify utf8 encoding in generated seahub_settings.py

scripts/setup-seafile-mysql.py

@@ -988,22 +988,29 @@ class SeahubConfigurator(AbstractConfigurator):
 
     def ask_questions(self):
         pass
-        # self.ask_admin_email()
-        # self.ask_admin_password()
 
     def generate(self):
         '''Generating seahub_settings.py'''
         print 'Generating seahub configuration ...\n'
         time.sleep(1)
-        self.write_secret_key()
+        with open(self.seahub_settings_py, 'w') as fp:
-        with open(self.seahub_settings_py, 'a') as fp:
+            self.write_utf8_comment(fp)
+            fp.write('\n')
+            self.write_secret_key(fp)
+            fp.write('\n')
             self.write_database_config(fp)
 
-    def write_secret_key(self):
+    def write_utf8_comment(self, fp):
-        Utils.run_argv([Utils.get_python_executable(),
+        fp.write('# -*- coding: utf-8 -*-')
-                        os.path.join(env_mgr.install_path, 'seahub',
+
-                                     'tools', 'secret_key_generator.py'),
+    def write_secret_key(self, fp):
-                        self.seahub_settings_py])
+        script = os.path.join(env_mgr.install_path, 'seahub/tools/secret_key_generator.py')
+        cmd = [
+            Utils.get_python_executable(),
+            script,
+        ]
+        key = Utils.get_command_output(cmd).strip()
+        fp.write('SECRET_KEY = "%s"' % key)
 
     def write_database_config(self, fp):
         template = '''\

scripts/setup-seafile.sh

@@ -530,9 +530,11 @@ dest_settings_py=${TOPDIR}/conf/seahub_settings.py
 seahub_secret_keygen=${INSTALLPATH}/seahub/tools/secret_key_generator.py
 
 if [[ ! -f ${dest_settings_py} ]]; then
-    echo -n "SECRET_KEY = " >> "${dest_settings_py}"
     key=$($PYTHON "${seahub_secret_keygen}")
-    echo "\"${key}\"" >> "${dest_settings_py}"
+    cat > ${dest_settings_py} <<EOF
+# -*- coding: utf-8 -*-
+SECRET_KEY = "$key"
+EOF
 fi
 
 # -------------------------------------------