Merge branch 'no-firewalld' into dev

Author: Hayao0819

Makefile

@@ -46,3 +46,7 @@ keyring::
 
 wizard:
 	@sudo ${CURRENT_DIR}/tools/wizard.sh
+
+check:
+	@bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error **/*.{sh,ksh,bash}'
+	@bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error tools/*.{sh,ksh,bash}'

channels/cinnamon/packages.i686/internet-gui.i686

@@ -17,10 +17,6 @@ if [[ "${arch}" = "x86_64" ]]; then
     systemctl enable apparmor.service
     systemctl enable snapd.socket
     systemctl enable snapd.service
-
-
-    # firewalld
-    systemctl enable firewalld.service
 fi
 
 

channels/gnome/packages.x86_64/internet-gui.x86_64

@@ -27,5 +27,4 @@ kdenetwork-filesharing
 
 
 #-- security --#
-firewalld
-ufw
+gufw

channels/plasma/airootfs.any/root/customize_airootfs_plasma.sh

@@ -16,10 +16,7 @@ _systemd_service enable snapd.apparmor.service
 _systemd_service enable apparmor.service
 _systemd_service enable snapd.socket
 _systemd_service enable snapd.service
-
-
-# firewalld
-_systemd_service enable firewalld.service
+_systemd_service enable ufw.service
 
 
 # Added autologin group to auto login

channels/plasma/packages.x86_64/internet.x86_64

@@ -24,5 +24,4 @@ firefox
 
 
 #-- security --#
-firewalld
-ufw
+gufw

channels/xfce/packages.x86_64/internet-gui.x86_64

@@ -24,5 +24,4 @@ chromium
 
 
 #-- security --#
-firewalld
-ufw
+gufw

modules/share-extra/airootfs.any/root/customize_airootfs_share-extra.sh

@@ -10,7 +10,6 @@
 set -e -u
 
 
-# Default value
 # Default value
 # All values can be changed by arguments.
 password=alter
@@ -56,45 +55,15 @@ kernel_mkinitcpio_profile="${kernel_config_line[2]}"
 # Make it compatible with previous code
 unset OPTIND OPTARG arg
 
+# Load functions
+source "/root/functions.sh"
 
-# Check whether true or false is assigned to the variable.
-function check_bool() {
-    local
-    case $(eval echo '$'${1}) in
-        true | false) : ;;
-                   *) echo "The value ${boot_splash} set is invalid" >&2 ;;
-    esac
-}
 
+# Check bool type
 check_bool boot_splash
 check_bool debug
 
 
-# Delete file only if file exists
-# remove <file1> <file2> ...
-function remove () {
-    local _list
-    local _file
-    _list=($(echo "$@"))
-    for _file in "${_list[@]}"; do
-        if [[ -f ${_file} ]]; then
-            rm -f "${_file}"
-        elif [[ -d ${_file} ]]; then
-            rm -rf "${_file}"
-        fi
-        echo "${_file} was deleted."
-    done
-}
-
-
-function installedpkg () {
-    if pacman -Qq "${1}" 1>/dev/null 2>/dev/null; then
-        return 0
-    else
-        return 1
-    fi
-}
-
 # Enable and generate languages.
 sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
 if [[ ! "${localegen}" = "en_US\\.UTF-8\\" ]]; then
@@ -113,21 +82,6 @@ if [[ -f "/etc/skel/Desktop/calamares.desktop" ]]; then
 fi
 
 
-# user_check <name>
-function user_check () {
-    if [[ ! -v 1 ]]; then return 2; fi
-    getent passwd "${1}" > /dev/null
-}
-
-# Execute only if the command exists
-# run_additional_command [command name] [command to actually execute]
-run_additional_command() {
-    if [[ -f "$(type -p "${1}" 2> /dev/null)" ]]; then
-        shift 1
-        eval "${@}"
-    fi
-}
-
 usermod -s "${usershell}" root
 cp -aT /etc/skel/ /root/
 if [[ -f "$(type -p "xdg-user-dirs-update" 2> /dev/null)" ]]; then LC_ALL=C LANG=Cxdg-user-dirs-update; fi
@@ -136,40 +90,8 @@ echo -e "${password}\n${password}" | passwd root
 # Allow sudo group to run sudo
 sed -i 's/^#\s*\(%sudo\s\+ALL=(ALL)\s\+ALL\)/\1/' /etc/sudoers
 
-# Create a user.
-# create_user <username> <password>
-function create_user () {
-    local _password
-    local _username
-
-    _username=${1}
-    _password=${2}
-
-    set +u
-    if [[ -z "${_username}" ]]; then
-        echo "User name is not specified." >&2
-        return 1
-    fi
-    if [[ -z "${_password}" ]]; then
-        echo "No password has been specified." >&2
-        return 1
-    fi
-    set -u
-
-    if ! user_check "${_username}"; then
-        useradd -m -s ${usershell} ${_username}
-        groupadd sudo
-        usermod -U -g ${_username} ${_username}
-        usermod -aG sudo ${_username}
-        usermod -aG storage ${_username}
-        cp -aT /etc/skel/ /home/${_username}/
-    fi
-    chmod 700 -R /home/${_username}
-    chown ${_username}:${_username} -R /home/${_username}
-    echo -e "${_password}\n${_password}" | passwd ${_username}
-    set -u
-}
 
+# Create user
 create_user "${username}" "${password}"
 
 
@@ -281,23 +203,6 @@ sed -i -r  "s/(GRUB_DISTRIBUTOR=).*/\1\"${grub_os_name}\"/g" "/etc/default/grub"
 run_additional_command "gtk-update-icon-cache -f /usr/share/icons/hicolor"
 
 
-# systemctl helper
-# Execute the subcommand only when the specified unit is available.
-# Usage: _systemd_service <systemctl subcommand> <service1> <service2> ...
-_systemd_service(){
-    local _service
-    local _command="${1}"
-    shift 1
-    for _service in "${@}"; do
-        # https://unix.stackexchange.com/questions/539147/systemctl-check-if-a-unit-service-or-target-exists
-        if (( "$(systemctl list-unit-files "${_service}" | wc -l)" > 3 )); then
-            systemctl ${_command} "${_service}"
-        else
-            echo "${_service} was not found" >&2
-        fi
-    done
-}
-
 # Enable graphical.
 _systemd_service set-default graphical.target