From 1c55eb532ed186baf5b0ac4b7b8504c8e84bfc8e Mon Sep 17 00:00:00 2001
From: cui-gaoleng <562344211@qq.com>
Date: Fri, 8 Nov 2024 02:53:37 +0800
Subject: [PATCH] =?UTF-8?q?/=E7=9B=AE=E5=BD=95=E4=B8=8B=E7=9A=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .editorconfig          | 29 +++++++++++++++++++++++++++++
 .gitattributes         | 14 ++++++++++++++
 .gitmodules            |  0
 CMakeLists.txt         | 21 +++++++++------------
 settings.conf          | 18 ++++++++++--------
 8 files changed, 114 insertions(+), 20 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .gitattributes
 create mode 100644 .gitmodules

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..44e191e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,29 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+
+[CMakeLists.txt]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+
+[*.cmake]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+
+[*.{py,cpp,h}]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+
+[*.sh]
+indent_style = tab
+insert_final_newline = true
+
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..6a8126f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,14 @@
+#   SPDX-FileCopyrightText: no
+#   SPDX-License-Identifier: CC0-1.0
+
+.editorconfig                  export-ignore
+.gitattributes                 export-ignore
+.github                        export-ignore
+.gitignore                     export-ignore
+.gitmodules                    export-ignore
+.travis.yml                    export-ignore
+.tx                            export-ignore
+
+src/modules/testmodule.py      export-ignore
+src/modules/globalStorage.yaml export-ignore
+
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e69de29
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9da614e..19395d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,8 +78,8 @@ set(CALAMARES_SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 ### OPTIONS
 #
 option(INSTALL_POLKIT "Install Polkit configuration" ON)
-option(INSTALL_COMPLETION "Install shell completions" OFF)
-option(INSTALL_CONFIG "Install configuration files" OFF)
+option(INSTALL_COMPLETION "Install shell completions" ON)
+option(INSTALL_CONFIG "Install configuration files" ON)
 # When adding WITH_* that affects the ABI offered by libcalamares,
 # also update libcalamares/CalamaresConfig.h.in
 option(WITH_PYBIND11 "Use bundled pybind11 instead of Boost::Python" ON)
@@ -128,9 +128,9 @@ set(USE_services "" CACHE STRING "Select the services module to use")
 
 ### Calamares application info
 #
-set(CALAMARES_ORGANIZATION_NAME "Calamares")
-set(CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares")
-set(CALAMARES_APPLICATION_NAME "Calamares")
+set(CALAMARES_ORGANIZATION_NAME "openEuler")
+set(CALAMARES_ORGANIZATION_DOMAIN "https://gitee.com/organizations/openeuler/")
+set(CALAMARES_APPLICATION_NAME "easysoftware")
 set(CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framework")
 
 ### Transifex (languages) info
@@ -155,13 +155,10 @@ set(CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framew
 #       `txstats.py -e`. See also
 #
 # Total 80 languages
-set( _tx_complete de en es_AR fi_FI hr hu ja lt tr_TR uk zh_TW )
-set( _tx_good az az_AZ be bg ca cs_CZ es fr fur he hi is it_IT ko
-    pl pt_BR pt_PT ru si sq sv zh_CN )
-set( _tx_ok ar as ast bn ca@valencia da el en_GB eo es_MX et eu fa
-    gl id ka ml mr nb nl oc ro sk sl sr sr@latin tg th vi )
-set( _tx_incomplete bqi es_PR gu ie ja-Hira kk kn lo lv mk ne_NP
-    ro_RO ta_IN te ur uz zh zh_HK )
+set( _tx_complete zh_TW )
+set( _tx_good zh_CN )
+set( _tx_ok en_GB )
+set( _tx_incomplete )
 # Total 80 languages
 
 ### Required versions
diff --git a/settings.conf b/settings.conf
index f4cbd05..f2d1106 100644
--- a/settings.conf
+++ b/settings.conf
@@ -118,9 +118,10 @@ sequence:
 #  - notesqml
 #  - packagechooserq@licenseq
   - locale
-  - keyboard
-  - partition
+#  - keyboard
   - users
+  - packagechooser
+  - partition
 #  - tracking
   - summary
 - exec:
@@ -134,23 +135,24 @@ sequence:
   - machineid
   - fstab
   - locale
-  - keyboard
+#  - keyboard
   - localecfg
 #  - luksbootkeyfile
 #  - luksopenswaphookcfg
-#  - dracutlukscfg
+  - dracutlukscfg
 #  - plymouthcfg
 #  - zfshostid
-  - initcpiocfg
-  - initcpio
+  #- initcpiocfg
+  #- initcpio
   - users
   - displaymanager
   - networkcfg
   - hwclock
   - services-systemd
 #  - dracut
-  - initramfs
-#  - grubcfg
+#  - initramfs
+  - packages
+  - grubcfg
   - bootloader
   - umount
 - show:
-- 
2.43.0