Merge branch 'dev' into dev-stable

Author: Hayao0819

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

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

channels/gnome/airootfs.any/etc/dconf/db/local.d/02-live-installer-panel

@@ -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"

channels/gnome/airootfs.any/usr/share/calamares/branding/alter/branding.desc

@@ -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.

channels/gnome/config.any

@@ -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

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

channels/gnome/packages_aur.x86_64/gnome-extensions.x86_64

@@ -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

channels/lxde/airootfs.any/usr/share/calamares/branding/alter/branding.desc

@@ -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]

channels/plasma/airootfs.any/usr/share/plasma/desktoptheme/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