Merge branch 'dev' into dev-stable

Author: Hayao0819

README.md

@@ -10,6 +10,9 @@
 | [日本語](README_jp.md) | [English](README.md) |
 |:-----:|:-----:|
 
+| [Stable](https://github.com/SereneTeam/alterlinux/tree/master) | [Unstable](https://github.com/SereneTeam/alterlinux/tree/dev-stable) | [Develop](https://github.com/SereneTeam/alterlinux/tree/dev) |
+|:-----:|:-----:|:-----:|
+
 ## Overview
 
 Alter Linux is a new OS developed based on Arch Linux.  

README_jp.md

@@ -10,6 +10,9 @@
 | [日本語](README_jp.md) | [English](README.md) |
 |:-----:|:-----:|
 
+| [安定版](https://github.com/SereneTeam/alterlinux/tree/master) | [リリース候補](https://github.com/SereneTeam/alterlinux/tree/dev-stable) | [開発](https://github.com/SereneTeam/alterlinux/tree/dev) |
+|:-----:|:-----:|:-----:|
+
 ## 概要
 
 Alter LinuxはArch Linuxをベースに開発されている新しいOSです。  

airootfs/etc/skel/.setup.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+function remove () {
+    local list
+    local file
+    local exit_code
+    list=($(echo "$@"))
+    for file in "${list[@]}"; do
+        if [[ -f ${file} ]]; then
+            rm -f "${file}"
+        elif [[ -d ${file} ]]; then
+            rm -rf "${file}"
+        fi
+    done
+}
+
+remove /etc/skel/Desktop
+remove /etc/systemd/system/getty@tty1.service.d/autologin.conf
+remove /root/.automated_script.sh
+remove /etc/mkinitcpio-archiso.conf
+remove /etc/initcpio

airootfs/usr/share/calamares/cleaning.sh

@@ -0,0 +1,35 @@
+# Configuration for the shell process job.
+#
+# Executes a list of commands found under the key *script*.
+# If the top-level key *dontChroot* is true, then the commands
+# are executed in the context of the live system, otherwise
+# in the context of the target system. In all of the commands,
+# the following substitutions will take place:
+#  - `@@ROOT@@` is replaced by the root mount point of the **target**
+#    system from the point of view of the command (for chrooted
+#    commands, that will be */*).
+#  - `@@USER@@` is replaced by the username, set on the user page.
+#
+# The (global) timeout for the command list can be set with
+# the *timeout* key. The value is a time in seconds, default
+# is 10 seconds if not set.
+#
+# If a command starts with "-" (a single minus sign), then the
+# return value of the command following the - is ignored; otherwise,
+# a failing command will abort the installation. This is much like
+# make's use of - in a command.
+#
+# The value of *script* may be:
+#   - a single string; this is one command that is executed.
+#   - a list of strings; these are executed one at a time, by
+#     separate shells (/bin/sh -c is invoked for each command).
+#   - an object, specifying a key *command* and (optionally)
+#     a key *timeout* to set the timeout for this specific
+#     command differently from the global setting.
+---
+dontChroot: false
+timeout: 50
+script:
+    - "chmod 755 /usr/share/calamares/cleaning.sh"
+    - "/usr/share/calamares/cleaning.sh"
+    - "rm /home/@@USER@@/Desktop/calamares.desktop"

airootfs/usr/share/calamares/modules/shellprocess.conf

@@ -115,6 +115,7 @@ sequence:
   - services
   - grubcfg
   - bootloader
+  - shellprocess
   - postcfg
   - umount
 - show:

airootfs/usr/share/calamares/settings.conf

@@ -43,7 +43,11 @@ _usage () {
     echo "    -c <comp_type>     Set SquashFS compression type (gzip, lzma, lzo, xz, zstd)"
     echo "                        Default: ${sfs_comp}"
     echo "    -g <gpg_key>       Set gpg key"
-    echo "                        Default: empty"
+    if [[ -z "${gpg_key}" ]]; then
+        echo "                        Default: empty"
+    else
+        echo "                        Default: ${gpg_key}"
+    fi
     echo "    -l                 Enable LTS linux kernel."
     echo "                        Default: disable"
     echo "    -o <out_dir>       Set the output directory"

build.sh

@@ -202,8 +202,9 @@ cups
 cups-pdf
 
 
-#-- task manager --#
+#-- system monitor --#
 gnome-system-monitor
+cpu-x
 
 
 #-- text editor --#