Merge branch 'stable'

.gitignore

@@ -10,6 +10,7 @@
 *.sig
 .build_option
 system/mkalteriso
+system/cpp-src/mkalteriso
 system/cpp-src/mkalteriso/build/
 pkg/
 src/
@@ -18,4 +19,4 @@ work/
 *.ignore*
 *.ig*
 *.add*
-temp/
+temp/

build.sh

@@ -355,24 +355,6 @@ load_config() {
 }
 
 
-# 作業ディレクトリを削除
-remove_work() {
-    if [[ -d "${work_dir}" ]]; then
-        remove "$(ls ${work_dir}/* | grep "build.make")"
-        remove "${work_dir}"/pacman-*.conf
-        remove "${work_dir}/efiboot"
-        remove "${work_dir}/iso"
-        remove "${work_dir}/${arch}"
-        remove "${work_dir}/packages.list"
-        remove "${work_dir}/packages-full.list"
-        #remove "${rebuildfile}"
-        if [[ -z $(ls $(realpath "${work_dir}")/* 2>/dev/null) ]]; then
-            remove ${work_dir}
-        fi
-    fi
-}
-
-
 # Display channel list
 show_channel_list() {
     local i
@@ -427,7 +409,7 @@ prepare_build() {
     trap_remove_work() {
         local status=${?}
         echo
-        remove_work
+        remove "${work_dir}"
         exit ${status}
     }
     trap 'trap_remove_work' 1 2 3 15
@@ -1000,7 +982,7 @@ make_boot() {
     if [[ ! "${kernel}" = "core" ]]; then
         cp "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-${kernel}" "${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz-linux-${kernel}"
     else
-        cp "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz"
+        cp "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz-linux"
     fi
 }
 
@@ -1009,7 +991,7 @@ make_boot_extra() {
     cp "${work_dir}/${arch}/airootfs/boot/intel-ucode.img" "${work_dir}/iso/${install_dir}/boot/intel_ucode.img"
     cp "${work_dir}/${arch}/airootfs/usr/share/licenses/intel-ucode/LICENSE" "${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE"
     cp "${work_dir}/${arch}/airootfs/boot/amd-ucode.img" "${work_dir}/iso/${install_dir}/boot/amd_ucode.img"
-    cp "${work_dir}/${arch}/airootfs/usr/share/licenses/amd-ucode/LICENSE" "${work_dir}/iso/${install_dir}/boot/amd_ucode.LICENSE"
+    cp "${work_dir}/${arch}/airootfs/usr/share/licenses/amd-ucode/LICENSE.amd-ucode" "${work_dir}/iso/${install_dir}/boot/amd_ucode.LICENSE"
 }
 
 # Prepare /${install_dir}/boot/syslinux
@@ -1313,7 +1295,7 @@ if [[ -d "${script_path}/.git" ]]; then
 fi
 
 # Show config message
-[[ -f "${defaultconfig}" ]] && _msg_debug "The settings have been overwritten by the ${defaultconfig}"
+[[ -f "${defaultconfig}" ]] && _msg_debug "Use the default configuration file (${defaultconfig})."
 
 # Debug mode
 mkalteriso_option="-a ${arch} -v"
@@ -1387,7 +1369,7 @@ if [[ -n "${1}" ]]; then
         fi
     fi
 
-    if [[ ! "${channel_name}" == "rebuild" ]]; then
+    if [[ ! "${channel_name}" == "rebuild" ]] && [[ ! "${channel_name}" == "clean" ]]; then
         _msg_debug "channel path is ${script_path}/channels/${channel_name}"
     fi
 fi
@@ -1413,7 +1395,8 @@ if [[ "${channel_name}" = "clean" ]]; then
     remove "${script_path}/menuconfig/build"
 	remove "${script_path}/system/cpp-src/mkalteriso/build"
 	remove "${script_path}/menuconfig-script/kernel_choice"
-    remove_work
+    remove "${work_dir%/}"/*
+    remove "${work_dir}"
     remove "${rebuildfile}"
     remove "${script_path}/temp"
     exit 0
@@ -1474,5 +1457,5 @@ run_once make_prepare
 run_once make_iso
 
 if [[ "${cleaning}" = true ]]; then
-    remove_work
+    remove "${work_dir}"
 fi

channels/README.md

@@ -0,0 +1,19 @@
+# 日本語
+
+## チャンネルについて
+チャンネルはビルドに必要なパッケージやファイル、設定などをひとまとめにしたものです。  
+チャンネルを切り替えることによって様々なエディションをビルドできます。  
+また、非公式なチャンネルを開発することで簡単にArch Linux派生ディストリビューションを開発することもできます。  
+
+チャンネルの詳細な仕様は[こちら](/docs/jp/CHANNEL.md)を参照して下さい。
+また、各チャンネルの概要はそれぞれのディレクトリのREADNEを参照して下さい。  
+
+# English
+
+## About channels
+A channel is a collection of packages, files, settings, etc. required for building.
+You can build different editions by switching channels.
+You can also easily develop an Arch Linux derivative distribution by developing an unofficial channel.
+
+See [here](/docs/en/CHANNEL.md) for detailed channel specifications.
+Please refer to READNE of each directory for the outline of each channel.

channels/cinnamon/README

@@ -0,0 +1,14 @@
+Alter Linux Cinnamon
+===========
+
+Japanese:
+中量級としてCinnamonエディションは開発されました。
+豪華なアニメーションと基本的なソフトウェアが入っています。
+x86_64をサポートしており、i686の中で最も重いエディションです。
+チャンネル名は cinnamon です
+
+English:
+Cinnamon Edition was developed as a middleweight class system.
+Gorgeous animation & standard software included.
+Supported x86_64 & i686.This is a heaviest edition for i686.
+The channel-name is cinnamon.

channels/cinnamon/airootfs.any/etc/dconf/db/local.d/01-alter-cinnamon

@@ -19,7 +19,6 @@ desktop-effects-unmaximize-effect='scale'
 desktop-effects-unmaximize-time=100
 desktop-effects-unmaximize-transition='easeOutBounce'
 enabled-applets=['panel1:left:0:[email protected]:0', 'panel1:left:1:[email protected]:2', 'panel1:right:0:[email protected]:3', 'panel1:right:1:[email protected]:4', 'panel1:right:2:[email protected]:5', 'panel1:right:3:[email protected]:6', 'panel1:right:4:[email protected]:7', 'panel1:right:5:[email protected]:8', 'panel1:right:6:[email protected]:9', 'panel1:right:7:[email protected]:10', 'panel1:right:8:[email protected]:11', 'panel1:right:9:[email protected]:12']
-favorite-apps=['chromium.desktop', 'nemo.desktop', 'org.gnome.Terminal.desktop', 'cinnamon-settings.desktop']
 hotcorner-layout=['expo:true:0', 'scale:false:0', ':true:0', 'desktop:true:0']
 next-applet-id=13
 panel-edit-mode=false

channels/cinnamon/airootfs.any/etc/dconf/db/local.d/02-disable-lock

@@ -0,0 +1,17 @@
+[org/cinnamon/desktop/lockdown]
+disable-lock-screen=true
+
+[org/gnome/desktop/lockdown]
+disable-lock-screen=true
+
+[org/cinnamon/desktop/screensaver]
+allow-keyboard-shortcuts=false
+default-message='Password: %PASSWORD%'
+layout-group=0
+lock-enabled=false
+
+[org/gnome/desktop/screensaver]
+lock-enabled=false
+
+[org/cinnamon/desktop/keybindings/media-keys]
+screensaver=@as []

channels/cinnamon/airootfs.any/etc/default/useradd

@@ -1,7 +1,7 @@
-# useradd defaults file for AlterLinux
+# useradd defaults file for Alter Linux
 # original changes by TomK
 
-# In AlterLinux, the default shell is changed to /bin/zsh from the default of ArchLinux (by Hayao)
+# In  , the default shell is changed to /bin/zsh from the default of ArchLinux (by Hayao)
 
 GROUP=users
 HOME=/home

channels/cinnamon/airootfs.any/etc/skel/.bash_profile

@@ -3,7 +3,7 @@
 #
 
 [[ -f ~/.bashrc ]] && . ~/.bashrc
-[[ -f /usr/local/bin/alterlinux-user-directory ]] && /usr/local/bin/alterlinux-user-directory
+
 if [[ $(systemctl is-active graphical.target) = "active" ]] && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
   exec startx
 fi

channels/cinnamon/airootfs.any/etc/skel/.config/autostart/gensidebar.desktop

@@ -4,7 +4,7 @@ Version=1.0
 Name=AlterLinux Sidebar
 Comment=Generates sidebar items.
 Icon=utilities-terminal
-Exec=/usr/local/bin/alterlinux-sidebar -f --alterlive init
+Exec=/usr/bin/alterlinux-gtk-bookmarks -f --alterlive init
 X-GNOME-Autostart-enabled=true
 Type=Application
 RunHook=0

channels/cinnamon/airootfs.any/etc/skel/.config/autostart/welcome_page.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=Welcome to Alter Linux
+Comment=Displays the Alter Linux welcome page.
+Icon=utilities-terminal
+Exec=/usr/bin/alterlinux-welcome-page -l --alterlive
+X-GNOME-Autostart-enabled=true
+Type=Application
+RunHook=0
+StartupNotify=false
+Terminal=false
+Hidden=false

channels/cinnamon/airootfs.any/etc/skel/.local/share/medit-1/prefs.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?><!-- -*- xml -*- -->
 <moo-prefs version="1.0">
   <Prefs>
+    <item name="Editor/color_scheme" type="string">cobalt</item>
     <item name="Editor/highlight_current_line" type="bool">FALSE</item>
     <item name="Editor/indent_width" type="int">4</item>
     <item name="Editor/open_dialog_follows_doc" type="bool">TRUE</item>
     <item name="Editor/show_line_numbers" type="bool">TRUE</item>
-    <item name="Editor/show_spaces" type="bool">TRUE</item>
     <item name="Editor/show_tabs" type="bool">TRUE</item>
     <item name="Editor/show_trailing_spaces" type="bool">TRUE</item>
     <item name="Editor/strip" type="bool">TRUE</item>

channels/cinnamon/airootfs.any/etc/skel/.xinitrc

@@ -29,5 +29,5 @@ export UNZIPOPT=-OCP932
 # No beep
 xset -b
 
-# Start xfce4
+# Start cinnamon
 exec cinnamon-session

channels/cinnamon/airootfs.any/etc/skel/.zprofile

@@ -2,7 +2,6 @@
 # ~/.zsh_profile
 #
 
-[[ -f /usr/local/bin/alterlinux-user-directory ]] && /usr/local/bin/alterlinux-user-directory
 if [[ $(systemctl is-active graphical.target) = "active" ]] && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
   exec startx
 fi

channels/cinnamon/airootfs.any/etc/skel/Desktop/welcome-to-alter.desktop

@@ -0,0 +1,16 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Icon=/usr/share/icons/hicolor/scalable/alter.svg
+Exec=/usr/bin/alterlinux-welcome-page 
+Type=Application
+StartupNotify=false
+Terminal=false
+Hidden=false
+
+Name=Welcome to Alter Linux
+Comment=Displays the Alter Linux welcome page.
+
+Name[ja]=Alter Linuxへようこそ
+GenericName[ja]=Alter Linuxへようこそ
+Comment[ja]=Alter Linuxの利用に役立つページです。

channels/cinnamon/airootfs.any/root/customize_airootfs_cinnamon.sh

@@ -62,14 +62,6 @@ function remove () {
 }
 
 
-# Replace wallpaper.
-if [[ -f /usr/share/backgrounds/xfce/xfce-stripes.png ]]; then
-    remove /usr/share/backgrounds/xfce/xfce-stripes.png
-    ln -s /usr/share/backgrounds/alter.png /usr/share/backgrounds/xfce/xfce-stripes.png
-fi
-[[ -f /usr/share/backgrounds/alter.png ]] && chmod 644 /usr/share/backgrounds/alter.png
-
-
 # Bluetooth
 rfkill unblock all
 systemctl enable bluetooth
@@ -83,32 +75,19 @@ if [[ "${arch}" = "x86_64" ]]; then
 fi
 
 
-# Update system datebase
-dconf update
-
-
 # firewalld
 systemctl enable firewalld.service
 
 
-# Replace link
-if [[ "${japanese}" = true ]]; then
-    remove "/etc/skel/Desktop/welcome-to-alter.desktop"
-    remove "/home/${username}/Desktop/welcome-to-alter.desktop"
-
-    mv "/etc/skel/Desktop/welcome-to-alter-jp.desktop" "/etc/skel/Desktop/welcome-to-alter.desktop"
-    mv "/home/${username}/Desktop/welcome-to-alter-jp.desktop" "/home/${username}/Desktop/welcome-to-alter.desktop"
-else
-    remove "/etc/skel/Desktop/welcome-to-alter-jp.desktop"
-    remove "/home/${username}/Desktop/welcome-to-alter-jp.desktop"
-fi
-
-
 # Added autologin group to auto login
 groupadd autologin
 usermod -aG autologin ${username}
 
 
+# ntp
+systemctl enable systemd-timesyncd.service
+
+
 # Enable LightDM to auto login
 if [[ "${boot_splash}" =  true ]]; then
     systemctl enable lightdm-plymouth.service
@@ -118,7 +97,13 @@ fi
 
 
 # Set script permission
-chmod 755 /usr/local/bin/alterlinux-sidebar
+chmod 755 /usr/bin/alterlinux-gtk-bookmarks
 
 # Replace auto login user
 sed -i s/%USERNAME%/${username}/g /etc/lightdm/lightdm.conf
+
+# Replace password for screensaver comment
+sed -i s/%PASSWORD%/${password}/g "/etc/dconf/db/local.d/02-disable-lock"
+
+# Update system datebase
+dconf update