Merge branch 'dev' into dev-stable

Hayao0819 · Hayao0819 · commit 08d9364b83bc · 2021-08-27T18:56:46.000+09:00
diff --git a/build.sh b/build.sh
@@ -993,9 +993,9 @@ make_alteriso_info(){
     # iso version info
     if [[ "${include_info}" = true ]]; then
         local _info_file="${isofs_dir}/alteriso-info" _version="${iso_version}"
-        #remove "${_info_file}"; touch "${_info_file}"
+        remove "${_info_file}"; touch "${_info_file}"
         [[ -d "${script_path}/.git" ]] && [[ "${gitversion}" = false ]] && _version="${iso_version}-${gitrev}"
-        "${tools_dir}/alteriso-info.sh" -a "${arch}" -b "${boot_splash}" -c "${channel_name%.add}" -d "${iso_publisher}" -k "${kernel}" -o "${os_name}" -p "${password}" -u "${username}" -v "${_version}" -m "$(printf "%s," "${modules[@]}")"
+        "${tools_dir}/alteriso-info.sh" -a "${arch}" -b "${boot_splash}" -c "${channel_name%.add}" -d "${iso_publisher}" -k "${kernel}" -o "${os_name}" -p "${password}" -u "${username}" -v "${_version}" -m "$(printf "%s," "${modules[@]}")" > "${_info_file}"
     fi
 
     return 0
@@ -1048,14 +1048,14 @@ make_iso() {
 
 
 # Parse options
-ARGUMENT=("${DEFAULT_ARGUMENT[@]}" "${@}")
-OPTS=("a:" "b" "c:" "d" "e" "g:" "h" "j" "k:" "l:" "o:" "p:" "r" "t:" "u:" "w:" "x")
-OPTL=("arch:" "boot-splash" "comp-type:" "debug" "cleaning" "cleanup" "gpgkey:" "help" "lang:" "japanese" "kernel:" "out:" "password:" "comp-opts:" "user:" "work:" "bash-debug" "nocolor" "noconfirm" "nodepend" "gitversion" "msgdebug" "noloopmod" "tarball" "noiso" "noaur" "nochkver" "channellist" "config:" "noefi" "nodebug" "nosigcheck" "normwork" "log" "logpath:" "nolog" "nopkgbuild" "pacman-debug" "confirm" "tar-type:" "tar-opts:" "add-module:" "nogitversion")
-OPT="$(getopt -o "$(printf "%s," "${OPTS[@]}")" -l "$(printf "%s," "${OPTL[@]}")" --  "${ARGUMENT[@]}")" || exit 1
-
-eval set -- "${OPT}"
-msg_debug "Argument: ${OPT}"
-unset OPT OPTS OPTL DEFAULT_ARGUMENT
+ARGUMENT=("${DEFAULT_ARGUMENT[@]}" "${@}") OPTS=("a:" "b" "c:" "d" "e" "g:" "h" "j" "k:" "l:" "o:" "p:" "r" "t:" "u:" "w:" "x") OPTL=("arch:" "boot-splash" "comp-type:" "debug" "cleaning" "cleanup" "gpgkey:" "help" "lang:" "japanese" "kernel:" "out:" "password:" "comp-opts:" "user:" "work:" "bash-debug" "nocolor" "noconfirm" "nodepend" "gitversion" "msgdebug" "noloopmod" "tarball" "noiso" "noaur" "nochkver" "channellist" "config:" "noefi" "nodebug" "nosigcheck" "normwork" "log" "logpath:" "nolog" "nopkgbuild" "pacman-debug" "confirm" "tar-type:" "tar-opts:" "add-module:" "nogitversion")
+GETOPT=(-o "$(printf "%s," "${OPTS[@]}")" -l "$(printf "%s," "${OPTL[@]}")" -- "${ARGUMENT[@]}")
+getopt -Q "${GETOPT[@]}" || exit 1 # 引数エラー判定
+readarray -t OPT < <(getopt "${GETOPT[@]}") # 配列に代入
+
+eval set -- "${OPT[@]}"
+msg_debug "Argument: ${OPT[*]}"
+unset OPT OPTS OPTL DEFAULT_ARGUMENT GETOPT
 
 while true; do
     case "${1}" in
diff --git a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gedit b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gedit
@@ -0,0 +1,11 @@
+[org/gnome/gedit/plugins]
+active-plugins=['spell', 'sort', 'modelines', 'filebrowser', 'docinfo']
+
+[org/gnome/gedit/preferences/editor]
+display-line-numbers=false
+highlight-current-line=false
+wrap-last-split-mode='word'
+
+[org/gnome/gedit/preferences/ui]
+show-tabs-mode='auto'
+statusbar-visible=true
diff --git a/channels/gnome/airootfs.any/etc/dconf/db/local.d/02-live-installer-panel b/channels/gnome/airootfs.any/etc/dconf/db/local.d/02-live-installer-panel
diff --git a/channels/gnome/airootfs.any/usr/share/calamares/branding/alter/branding.desc b/channels/gnome/airootfs.any/usr/share/calamares/branding/alter/branding.desc
@@ -74,7 +74,7 @@ strings:
     versionedName:       Alter Linux
     shortVersionedName:  Alter Linux
     bootloaderEntryName: Alter
-    productUrl:          https://fascode.net/projects/linux/alter/
+    productUrl:          https://alter.fascode.net/
     supportUrl:          https://github.com/SereneTeam/alterlinux/issues
     knownIssuesUrl:      https://alterlinux.com
     releaseNotesUrl:     https://github.com/SereneTeam/alterlinux/releases
@@ -127,7 +127,7 @@ slideshowAPI: 2
 # branding component also ships a stylesheet.qss. Then they are
 # the corresponding CSS attributes of #sidebarApp.
 style:
-   sidebarBackground:    "#222D32"
+   sidebarBackground:    "#272727"
    sidebarText:          "#FFFFFF"
    sidebarTextSelect:    "#0079ef"
-   sidebarTextHighlight: "#222D32"
+   sidebarTextHighlight: "#272727"
diff --git a/channels/gnome/config.any b/channels/gnome/config.any
@@ -15,8 +15,12 @@
 # Set the user's default shell.
 usershell="/bin/zsh"
 
-# Force install the AUR package.
-noaur=false
+# aur Warning
+if [[ "${noaur-""}" = true ]]; then
+    msg_warn "===== Warning of Gnome channel ====="
+    msg_warn "If noaur is true, many extensions will not be installed."
+    msg_warn "===================================="
+fi
 
 # Modules to include
 # An array of module directory names to include.
diff --git a/channels/gnome/packages_aur.i686/gnome-extensions.i686 b/channels/gnome/packages_aur.i686/gnome-extensions.i686
@@ -17,4 +17,3 @@ gnome-shell-extension-coverflow-alt-tab
 gnome-shell-extension-dash-to-panel
 gnome-shell-extension-desktop-icons-ng
 gnome-shell-extension-extensions
-#gnome-shell-extension-topicons-redux
diff --git a/channels/gnome/packages_aur.x86_64/gnome-extensions.x86_64 b/channels/gnome/packages_aur.x86_64/gnome-extensions.x86_64
@@ -17,4 +17,3 @@ gnome-shell-extension-coverflow-alt-tab
 gnome-shell-extension-dash-to-panel
 gnome-shell-extension-desktop-icons-ng
 gnome-shell-extension-extensions
-#gnome-shell-extension-topicons-redux
diff --git a/channels/lxde/airootfs.any/usr/share/calamares/branding/alter/branding.desc b/channels/lxde/airootfs.any/usr/share/calamares/branding/alter/branding.desc
@@ -74,7 +74,7 @@ strings:
     versionedName:       Alter Linux
     shortVersionedName:  Alter Linux
     bootloaderEntryName: Alter
-    productUrl:          https://fascode.net/projects/linux/alter/
+    productUrl:          https://alter.fascode.net/
     supportUrl:          https://github.com/SereneTeam/alterlinux/issues
     knownIssuesUrl:      https://alterlinux.com
     releaseNotesUrl:     https://github.com/SereneTeam/alterlinux/releases
diff --git a/channels/plasma/airootfs.any/usr/share/plasma/desktoptheme/alterlinux/metadata.desktop b/channels/plasma/airootfs.any/usr/share/plasma/desktoptheme/alterlinux/metadata.desktop
@@ -15,7 +15,7 @@ X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-PluginInfo-License=GPL 3+
 X-KDE-PluginInfo-Name=alterlinux
 X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=https://fascode.net/projects/linux/alter/
+X-KDE-PluginInfo-Website=https://alter.fascode.net/
 X-Plasma-API=5.0
 
 [Wallpaper]
diff --git a/channels/plasma/airootfs.any/usr/share/plasma/look-and-feel/net.fascode.alterlinux/metadata.desktop b/channels/plasma/airootfs.any/usr/share/plasma/look-and-feel/net.fascode.alterlinux/metadata.desktop
@@ -12,5 +12,5 @@ X-KDE-PluginInfo-License=GPL 3+
 X-Plasma-MainScript=defaults
 X-KDE-PluginInfo-Name=net.fascode.alterlinux
 X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=https://fascode.net/projects/alterlinux
+X-KDE-PluginInfo-Website=https://alter.fascode.net/
 X-KDE-ServiceTypes=Plasma/LookAndFeel
diff --git a/channels/plasma/airootfs.any/usr/share/plasma/look-and-feel/net.fascode.alterlinux/metadata.json b/channels/plasma/airootfs.any/usr/share/plasma/look-and-feel/net.fascode.alterlinux/metadata.json
@@ -14,7 +14,7 @@
             "Plasma/LookAndFeel"
         ],
         "Version": "0.1.0",
-        "Website": "https://fascode.net/projects/alterlinux"
+        "Website": "https://alter.fascode.net/"
     },
     "Keywords": "Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;",
     "X-KDE-fallbackPackage": "org.kde.breeze.desktop",
diff --git a/default.conf b/default.conf
@@ -130,9 +130,8 @@ norescue_entry=false
 # Modules to include
 # An array of module directory names to include.
 # This setting cannot be changed by an argument.
-modules=(
-    "share"
-)
+# Use this array only in the configuration files in the channel.
+#modules=("share")
 
 #-- kernel config --#
 # Set the kernel that live session use.
@@ -287,7 +286,8 @@ additional_exclude_pkg=()
 
 # Additional list of modules to load
 # Use this array for debugging only
-# This setting cannot be changed by an argument.
+# Change the default behavior of "--add-module".
+# This array is not available in the configuration files in the channel.
 additional_modules=()
 
 # Run with tee command
diff --git a/docs/README.md b/docs/README.md
@@ -4,7 +4,7 @@
     <img src="../images/logo/color-black-catchcopy/AlterV6-LogowithCopy-Colored-DarkText-256px.png" alt="Alter Linux logo">
 </p>
 <p align="center">
-    <a href="https://fascode.net/en/projects/linux/alter/">
+    <a href="https://alter.fascode.net/">
         <img src="https://img.shields.io/badge/Maintained%3F-Yes-green?style=flat-square">
     </a>
     <a href="../LICENSE">
@@ -62,10 +62,10 @@
 <h2>〈Overview〉</h2>
 Alter Linux is a new OS developed based on Arch Linux.<br>
 Check the <a href="https://github.com/orgs/FascodeNet/projects/2">project board</a> for the latest status of Alter Linux.<br>
-Please see the <a href="https://fascode.net/projects/linux/alter/">official website</a> for information on announcements and bugs for users.
+Please see the <a href="https://alter.fascode.net/">official website</a> for information on announcements and bugs for users.
 
 <h2>〈Download〉</h2>
-The image file can be downloaded from the official <a href="https://fascode.net/projects/linux/alter/#downloads">website</a>.
+The image file can be downloaded from the official <a href="https://alter.fascode.net/#downloads">website</a>.
 <br>
 <b>We are looking for a mirror server provider for repositories and image file distribution.</b>
 <br>
@@ -168,7 +168,7 @@ In addition, please write down the situation and model name <a href="https://git
 
 <h2>〈About FascodeNetwork and developers〉</h2>
 <a href="https://fascode.net/">Fascode Network</a> is a creative team mainly composed of students.<br>
-We are developing <a href="https://fascode.net/projects/linux/alter/">Alter Linux</a> and <a href="https://fascode.net/projects/linux/serene/">SereneLinux</a>.
+We are developing <a href="https://alter.fascode.net/">Alter Linux</a> and <a href="https://serene.fascode.net/">SereneLinux</a>.
 
 <h3>Official Twitter account</h3>
 <a href="https://twitter.com/FascodeNetwork">
diff --git a/docs/README_jp.md b/docs/README_jp.md
@@ -5,7 +5,7 @@
     <img src="../images/logo/color-black-catchcopy/AlterV6-LogowithCopy-Colored-DarkText-256px.png" alt="Alter Linux logo">
 </p>
 <p align="center">
-    <a href="https://fascode.net/en/projects/linux/alter/">
+    <a href="https://alter.fascode.net/">
         <img src="https://img.shields.io/badge/Maintained%3F-Yes-green?style=flat-square">
     </a>
     <a href="../LICENSE">
@@ -59,10 +59,10 @@
 <h2>〈概要〉</h2>
 Alter LinuxはArch Linuxをベースに開発されている新しいOSです。<br>
 Alter Linuxの最新の開発状況は<a href="https://github.com/orgs/FascodeNet/projects/2">プロジェクトボード</a>を確認してください。<br>
-ユーザ向けのアナウンスや不具合等の情報は<a href="https://fascode.net/projects/linux/alter/">公式サイト</a>をご覧ください。
+ユーザ向けのアナウンスや不具合等の情報は<a href="https://alter.fascode.net/">公式サイト</a>をご覧ください。
 
 <h2>〈ダウンロード〉</h2>
-イメージファイルは<a href="https://fascode.net/projects/linux/alter/#downloads">公式サイト</a>からダウンロードできます。
+イメージファイルは<a href="https://alter.fascode.net/#downloads">公式サイト</a>からダウンロードできます。
 <br>
 <b>私達はリポジトリやイメージファイル配布用のミラーサーバ提供者を募集しております。</b>
 <br>
@@ -171,7 +171,7 @@ Alter Linuxの最新の開発状況は<a href="https://github.com/orgs/FascodeNe
 
 <h2>〈FascodeNetworkと開発者について〉</h2>
 <a href="https://fascode.net/">Fascode Network</a>は学生を主体とする創作チームです。<br>
-<a href="https://fascode.net/projects/linux/alter/">Alter Linux</a>と<a href="https://fascode.net/projects/linux/serene/">SereneLinux</a>の開発を行っています。
+<a href="https://alter.fascode.net/">Alter Linux</a>と<a href="https://serene.fascode.net/">SereneLinux</a>の開発を行っています。
 
 <h3>公式Twitterアカウント</h3>
 <a href="https://twitter.com/FascodeNetwork">
diff --git a/modules/calamares/airootfs.any/usr/share/calamares/branding/alter/branding.desc b/modules/calamares/airootfs.any/usr/share/calamares/branding/alter/branding.desc
@@ -74,7 +74,7 @@ strings:
     versionedName:       Alter Linux
     shortVersionedName:  Alter Linux
     bootloaderEntryName: Alter
-    productUrl:          https://fascode.net/projects/linux/alter/
+    productUrl:          https://alter.fascode.net/
     supportUrl:          https://github.com/SereneTeam/alterlinux/issues
     knownIssuesUrl:      https://alterlinux.com
     releaseNotesUrl:     https://github.com/SereneTeam/alterlinux/releases
diff --git a/modules/calamares/airootfs.any/usr/share/calamares/modules/services-plymouth.conf b/modules/calamares/airootfs.any/usr/share/calamares/modules/services-plymouth.conf
@@ -77,7 +77,7 @@ services:
   - name: "org.cups.cupsd"
     mandatory: false
 
-  - name: "lightdm-plymouth"
+  - name: "%DM%-plymouth"
     mandatory: false
 
   - name: "pacman-init"
diff --git a/modules/calamares/airootfs.any/usr/share/calamares/modules/services.conf b/modules/calamares/airootfs.any/usr/share/calamares/modules/services.conf
@@ -0,0 +1,105 @@
+# Systemd services manipulation.
+#
+# This module can enable services and targets for systemd
+# (if packaging doesn't already do that). It can calso
+# disable services (but not targets).
+#
+# First, services are enabled; then targets; then services
+# are disabled -- this order of operations is fixed.
+---
+
+# There are three configuration keys for this module:
+# *services*, *targets* and *disable*. The value of each
+# key is a list of entries. Each entry has two keys:
+#   - *name* is the (string) name of the service or target that is being
+#     changed. Use quotes. Don't include ".target" or ".service"
+#     in the name.
+#   - *mandatory* is a boolean option, which states whether the change
+#     must be done successfully. If systemd reports an error while changing
+#     a mandatory entry, the installation will fail. When mandatory is false,
+#     errors for that entry (service or target) are ignored. If mandatory
+#     is not specified, the default is false.
+#
+# An entry may also be given as a single string, which is then
+# interpreted as the name of the service. In this case, mandatory
+# is also set to the default of false.
+#
+# Use [] to express an empty list.
+
+# # This example enables NetworkManager (and fails if it can't),
+# # disables cups (and ignores failure). Then it enables the
+# # graphical target (e.g. so that SDDM runs for login), and
+# # finally disables pacman-init (an ArchLinux-only service).
+# #
+# # Enables <name>.service
+# services:
+#   - name: "NetworkManager"
+#     mandatory: true
+#   - name: "cups"
+#     mandatory: false
+#
+# # Enables <name>.target
+# targets:
+#   - name: "graphical"
+#     mandatory: true
+#
+# # Disables <name>.service
+# disable:
+#   - name: "pacman-init"
+#     mandatory: false
+#
+# # Disables <name>.target
+# #     .. this shows how to use just the name
+# disable-targets:
+#   - graphical
+#
+# # Masks (stronger version of disable). This section
+# # is unusual because you **must** include the suffix
+# # (e.g. ".service") as part of the name, so, e.g. to mask
+# # NetworkManager (rather than just disable it) you must
+# # specify "NetworkManager.service" as name.
+# mask:
+#  - name: "NetworkManager.service"
+#  - mandatory: true
+
+# By default, no changes are made.
+#services: []
+#targets: []
+#disable: []
+disable-targets: []
+
+# Manjaro settings
+
+services:
+  - name: "NetworkManager"
+    mandatory: false
+
+  - name: "org.cups.cupsd"
+    mandatory: false
+
+  - name: "%DM%-plymouth"
+    mandatory: false
+
+  - name: "pacman-init"
+    mandatory: false
+
+  - name: "tlp"
+    mandatory: false
+
+  - name: "tlp-sleep"
+    mandatory: false
+
+targets:
+  - name: "graphical"
+    mandatory: true
+
+disable:
+  - name: "dhcpcd"
+    mandatory: false
+
+mask:
+  - name: "systemd-rfkill"
+    mandatory: false
+
+  - name: "systemd-rfkill.socket"
+    mandatory: false
diff --git a/modules/debug/alteriso b/modules/debug/alteriso
@@ -0,0 +1 @@
+alteriso=3.1
diff --git a/modules/debug/architecture b/modules/debug/architecture
@@ -0,0 +1,11 @@
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Supported architecture list
+
+x86_64
+i686
diff --git a/modules/debug/packages.i686/scripts.i686 b/modules/debug/packages.i686/scripts.i686
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+# lap1sid
+# Twitter: @Pixel_3a
+# Email  : lap1sid@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- scripts --#
+alterlinux-live-info
diff --git a/modules/debug/packages.x86_64/scripts.x86_64 b/modules/debug/packages.x86_64/scripts.x86_64
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+# lap1sid
+# Twitter: @Pixel_3a
+# Email  : lap1sid@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- scripts --#
+alterlinux-live-info
diff --git a/modules/gdm/airootfs.any/root/customize_airootfs_gdm.sh b/modules/gdm/airootfs.any/root/customize_airootfs_gdm.sh
@@ -10,7 +10,6 @@
 # Enable gdm to auto login
 if [[ "${boot_splash}" =  true ]]; then
     _safe_systemctl enable gdm-plymouth.service
-    
 else
     _safe_systemctl enable gdm.service
 fi
@@ -26,3 +25,11 @@ if [[ ! "${language}" = "ja" ]]; then
     sed -i "s/export QT_IM_MODULE=fcitx/#export QT_IM_MODULE=fcitx/g" "/etc/environment"
     sed -i "s/export XMODIFIERS=@im=fcitx/#export XMODIFIERS=@im=fcitx/g" "/etc/environment"
 fi
+
+# Prepare gdm for calamares
+for file in "services" "services-plymouth"; do
+    if [[ -f "/usr/share/calamares/modules/${file}.conf" ]]; then
+        sed -i "s|%DM%|gdm|g" "/usr/share/calamares/modules/${file}.conf"
+    fi
+done
+
diff --git a/modules/lightdm/airootfs.any/root/customize_airootfs_lightdm.sh b/modules/lightdm/airootfs.any/root/customize_airootfs_lightdm.sh
diff --git a/modules/share-extra/airootfs.x86_64/etc/pacman.conf b/modules/share-extra/airootfs.x86_64/etc/pacman.conf
diff --git a/modules/share/airootfs.any/root/functions.sh b/modules/share/airootfs.any/root/functions.sh
diff --git a/modules/share/airootfs.any/usr/lib/os-release b/modules/share/airootfs.any/usr/lib/os-release
diff --git a/system/pacman-x86_64.conf b/system/pacman-x86_64.conf
