Merge pull request #22 from Hayao0819/non-multilang

いくつかの改善と最新のCalamaresへの更新

Author: noMA-4

.editorconfig

@@ -7,6 +7,16 @@ 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

CHANGES

@@ -3,11 +3,13 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-# 3.2.21 (unreleased) #
+# 3.2.21 (2020-03-27) #
 
 This release contains contributions from (alphabetically by first name):
+ - Anke Boersma
  - Camilo Higuita
  - Gabriel Craciunescu
+ - Gaël PORTAY
 
 ## Core ##
  - Python job modules (such as *unpackfs* or *packages*) can now provide
@@ -24,17 +26,30 @@ This release contains contributions from (alphabetically by first name):
    more configurable: the branding key *sidebar* controls it. The sidebar
    can be shown as a widget (default, as it has been), hidden, or use a
    new QML view which is more easily customised.
+ - A new `settings.conf` key *quit-at-end* will automatically close
+   Calamares (by clicking on the *Done* button) when the end of the
+   sequence is reached. If *finished* is the last module in the sequence,
+   this will run whatever it is configured for; you can also leave out
+   the finished page and Calamares will close after the exec parts.
 
 ## Modules ##
  - *packages* now reports more details in the installation progress-bar.
- - *netinstall* module supports and `expanded` key, which will pre-expand
+ - *netinstall* module supports an `expanded` key, which will pre-expand
    a group (as if the user had pressed the arrow-button in the tree-view).
-   This only affects the UI.
+   This only affects the UI, and only the **outermost** level of groups.
+ - *netinstall* module now supports a special value for *groupsUrl*.
+   Setting this to *local* will read the groups directly from the
+   configuration file.
+ - *netinstall* groups now support a new key `immutable` which prevents
+   their check-state from being changed (they are shown, or hidden,
+   as usual and can be expanded).
  - Modules that use QML need a new import line. The QML file for the
    module is configured through new keys *qmlSearch* and *qmlFilename*
    (previously those were without the `qml` prefix, which invites name
    collisions). The full module identifier is also used as a filename,
    so that multiple instances of a module can use different QML files.
+ - *partition* module has a number of new features and settings for
+   type, UUID, and filesystem characteristics. Thanks to Gaël.
 
 
 # 3.2.20 (2020-02-27) #

CMakeLists.txt

@@ -43,7 +43,7 @@ project( CALAMARES
     VERSION 3.2.21
     LANGUAGES C CXX )
 
-set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

CMakeModules/CalamaresAddTest.cmake

@@ -50,7 +50,7 @@ function( calamares_add_test )
                 Qt5::Test
             )
         calamares_automoc( ${TEST_NAME} )
-        target_compile_definitions( ${TEST_NAME} PRIVATE -DBUILD_AS_TEST ${TEST_DEFINITIONS} )
+        target_compile_definitions( ${TEST_NAME} PRIVATE -DBUILD_AS_TEST="${CMAKE_CURRENT_SOURCE_DIR}"  ${TEST_DEFINITIONS} )
         if( TEST_GUI )
             target_link_libraries( ${TEST_NAME} calamaresui Qt5::Gui )
         endif()

data/final-process

@@ -23,40 +23,20 @@ remove /etc/skel/Desktop
 remove /etc/skel/.config/gtk-3.0/bookmarks
 remove /home/${user}/Desktop/calamares.desktop
 remove /home/${user}/.config/gtk-3.0/bookmarks
+remove /usr/share/calamares/
+
+# Delete unnecessary files of archiso.
+# See the following site for details.
+# https://wiki.archlinux.jp/index.php/Archiso#Chroot_.E3.81.A8.E3.83.99.E3.83.BC.E3.82.B9.E3.82.B7.E3.82.B9.E3.83.86.E3.83.A0.E3.81.AE.E8.A8.AD.E5.AE.9A
+
 remove /etc/systemd/system/getty@tty1.service.d/autologin.conf
 remove /root/.automated_script.sh
 remove /etc/mkinitcpio-archiso.conf
 remove /etc/initcpio
-remove /usr/share/calamares/
-
-<<DISABLED
-if [[ -f /home/${user}/.config/user-dirs.dirs ]]; then
-    HOME="/home/${user}"
-    source ${HOME}/.config/user-dirs.dirs
 
-    # Add pictures to bookmark
-    echo -n "file://" >> ${HOME}/.config/gtk-3.0/bookmarks
-    echo -n "${XDG_PICTURES_DIR}" >> ${HOME}/.config/gtk-3.0/bookmarks
-    echo -ne "\n" >> ${HOME}/.config/gtk-3.0/bookmarks
-
-    # Add videos to bookmark
-    echo -n "file://" >> ${HOME}/.config/gtk-3.0/bookmarks
-    echo -n "${XDG_VIDEOS_DIR}" >> ${HOME}/.config/gtk-3.0/bookmarks
-    echo -ne "\n" >> ${HOME}/.config/gtk-3.0/bookmarks
-
-    # Add music to bookmark
-    echo -n "file://" >> ${HOME}/.config/gtk-3.0/bookmarks
-    echo -n "${XDG_VIDEOS_DIR}" >> ${HOME}/.config/gtk-3.0/bookmarks
-    echo -ne "\n" >> ${HOME}/.config/gtk-3.0/bookmarks
-
-    # Add downloads to bookmark
-    echo -n "file://" >> ${HOME}/.config/gtk-3.0/bookmarks
-    echo -n "${XDG_DOWNLOAD_DIR}" >> ${HOME}/.config/gtk-3.0/bookmarks
-    echo -ne "\n" >> ${HOME}/.config/gtk-3.0/bookmarks
-
-    # Add documents to bookmark
-    echo -n "file://" >> ${HOME}/.config/gtk-3.0/bookmarks
-    echo -n "${XDG_DOCUMENTS_DIR}" >> ${HOME}/.config/gtk-3.0/bookmarks
-    echo -ne "\n" >> ${HOME}/.config/gtk-3.0/bookmarks
+if [[ -f /etc/systemd/journald.conf ]]; then
+    sed -i 's / Storage = volatile /＃Storage = auto /' /etc/systemd/journald.conf
 fi
-DISABLED
+
+remove /etc/udev/rules.d/81-dhcpcd.rules
+remove /etc/systemd/system/{choose-mirror.service,etc-pacman.d-gnupg.mount,getty@tty1.service.d}