Merge branch 'Issue-244' into no-mkalteriso

Hayao0819 · Hayao0819 · commit e80c9a54796c · 2021-03-16T16:14:28.000+09:00
Done #244
diff --git a/build.sh b/build.sh
@@ -353,31 +353,32 @@ check_bool() {
 prepare_env() {
     # Check packages
     if [[ "${nodepend}" = false ]]; then
-        local _check_failed=false _pkg _result
+        local _check_failed=false _pkg _result=0 _version
         msg_info "Checking dependencies ..."
         for _pkg in ${dependence[@]}; do
             msg_debug -n "Checking ${_pkg} ..."
-            _result=( $("${tools_dir}/package.py" -s "${_pkg}") )
-            case "${_result[0]}" in
-                "latest")
-                    [[ "${debug}" = true ]] && echo -ne " ${_result[1]}\n"
+            _version="$("${tools_dir}/package.py" -s "${_pkg}")" || _result="${?}"
+            case "${_result}" in
+                "0")
+                    [[ "${debug}" = true ]] && echo -ne " ${_version}\n"
                     ;;
-                "noversion")
+                "1")
                     echo; msg_warn "Failed to get the latest version of ${_pkg}."
                     ;;
-                "nomatch")
+                "2")
                     [[ "${debug}" = true ]] && echo -ne " ${_result[1]}\n"
                     msg_warn "The version of ${_pkg} installed in local does not match one of the latest.\nLocal: ${_result[1]} Latest: ${_result[2]}"
                     ;;
-                "failed")
+                "3")
                     [[ "${debug}" = true ]] && echo
                     msg_error "${_pkg} is not installed." ; _check_failed=true
                     ;;
-                "error")
+                "4")
                     [[ "${debug}" = true ]] && echo
                     msg_error "pyalpm is not installed." ; exit 1
                     ;;
             esac
+            _result=0
         done
         if [[ "${_check_failed}" = true ]]; then exit 1; fi
     fi
@@ -487,7 +488,8 @@ prepare_build() {
 
     local module_check
     module_check(){
-        if [[ ! "$(bash "${tools_dir}/module.sh" check "${1}")" = "correct" ]]; then
+        msg_debug "Checking ${1} module ..."
+        if ! bash "${tools_dir}/module.sh" check "${1}"; then
             msg_error "Module ${1} is not available." "1";
         fi
     }
@@ -538,15 +540,12 @@ prepare_build() {
     check_bool boot_splash cleaning noconfirm nodepend customized_username customized_password noloopmod nochname tarball noiso noaur customized_syslinux norescue_entry debug bash_debug nocolor msgdebug noefi nosigcheck
 
     # Check architecture for each channel
-    if [[ ! "$(bash "${tools_dir}/channel.sh" --version "${alteriso_version}" -a ${arch} -n -b check "${channel_name}")" = "correct" ]]; then
+    local _exit=0
+    bash "${tools_dir}/channel.sh" --version "${alteriso_version}" -a ${arch} -n -b check "${channel_name}" || _exit="${?}"
+    if (( "${_exit}" != 0 )) && (( "${_exit}" != 1 )); then
         msg_error "${channel_name} channel does not support current architecture (${arch})." "1"
     fi
 
-    # Check kernel for each channel
-    if [[ ! "$(bash "${tools_dir}/kernel.sh" -c "${channel_name}" -a "${arch}" -s check "${kernel}")" = "correct" ]]; then
-        msg_error "This kernel is currently not supported on this channel or architecture" "1"
-    fi
-
     # Unmount
     umount_chroot
 }
@@ -1304,15 +1303,15 @@ if [[ "${bash_debug}" = true ]]; then set -x -v; fi
 
 # Check for a valid channel name
 if [[ -n "${1+SET}" ]]; then
-    case "$(bash "${tools_dir}/channel.sh" --version "${alteriso_version}" -n check "${1}")" in
-        "incorrect")
+    case "$(bash "${tools_dir}/channel.sh" --version "${alteriso_version}" -n check "${1}"; printf "${?}")" in
+        "2")
             msg_error "Invalid channel ${1}" "1"
             ;;
-        "directory")
+        "1")
             channel_dir="${1}"
             channel_name="$(basename "${1%/}")"
             ;;
-        "correct")
+        "0")
             channel_dir="${script_path}/channels/${1}"
             channel_name="${1}"
             ;;
diff --git a/tools/channel.sh b/tools/channel.sh
@@ -38,6 +38,12 @@ _help() {
     echo "    -h | --help               This help message"
     echo
     echo "         --nocheck            Do not check the channel with desc command.This option helps speed up."
+    echo
+    echo " check command exit code"
+    echo "    0 (correct)               Normal available channel"
+    echo "    1 (directory)             Channel outside the channel directory"
+    echo "    2 (incorrect)             Unavailable channel"
+    echo "    3                         Other error"
 }
 
 gen_channel_list() {
@@ -111,19 +117,23 @@ check() {
     gen_channel_list
     if [[ ! "${#}" = "1" ]]; then
         _help
-        exit 1
+        exit 3
     fi
     if [[ $(printf '%s\n' "${channellist[@]}" | grep -qx "${1}"; echo -n ${?} ) -eq 0 ]]; then
-        echo "correct"
+        #echo "correct"
+        exit 0
     elif [[ -d "${1}" ]] && [[ -n $(ls "${1}") ]]; then
         local _channel_name="$(basename "${1%/}")"
         if ! check_alteriso_version "${_channel}" || [[ "${opt_nochkver}" = true ]]; then
-            echo "directory"
+            #echo "directory"
+            exit 1
         else
-            echo "incorrect"
+            #echo "incorrect"
+            exit 2
         fi
     else
-        echo "incorrect"
+        #echo "incorrect"
+        exit 2
     fi
 }
 
@@ -133,7 +143,7 @@ desc() {
         _help
         exit 1
     fi
-    if [[ "${opt_nocheck}" = false ]] && [[ ! "$(bash "${script_path}/tools/channel.sh" -a ${arch} -n -b check "${1}")" = "correct" ]]; then
+    if [[ "${opt_nocheck}" = false ]] && ! bash "${script_path}/tools/channel.sh" -a ${arch} -n -b check "${1}"; then
         exit 1
     fi
     local _channel
diff --git a/tools/kernel.sh b/tools/kernel.sh
@@ -15,16 +15,20 @@ _help() {
     echo "Scripts that perform kernel-related processing " 
     echo
     echo " General command:"
-    echo "    check [name]       Determine if the kernel is available"
-    echo "    show               Shows a list of available kernels"
-    echo "    get [name]         Prints the specified kernel settings"
-    echo "    help               This help message"
+    echo "    check [name]              Determine if the kernel is available"
+    echo "    show                      Shows a list of available kernels"
+    echo "    get [name]                Prints the specified kernel settings"
+    echo "    help                      This help message"
     echo
     echo " General options:"
     echo "    -a | --arch [arch]        Specify the architecture"
     echo "    -c | --channel            Specify the channel"
     echo "    -s | --script             Enable script mode"
     echo "    -h | --help               This help message"
+    echo
+    echo " Script mode usage:"
+    echo "     check                    Returns 0 if the check was successful, 1 otherwise."
+    printf '     get                      eval $(%s -s -a <arch> -c <channel> get <kernel>)\n' "$(basename ${0})"
 }
 
 # Usage: getclm <number>
@@ -46,6 +50,8 @@ gen_kernel_list() {
     local _list _kernel
     if [[ -n "${channel}" ]] && [[ -f "${script_path}/channels/${channel}/kernel_list-${arch}" ]]; then
         _list="${script_path}/channels/${channel}/kernel_list-${arch}"
+    elif [[ -n "${channel}" ]] && [[ -f "${script_path}/channels/${channel}/kernel-${arch}" ]]; then
+        _list="${script_path}/channels/${channel}/kernel-${arch}"
     else
         _list="${script_path}/system/kernel-${arch}"
     fi
@@ -61,10 +67,10 @@ check() {
         exit 1
     fi
     if [[ $(printf '%s\n' "${kernellist[@]}" | grep -qx "${1}"; echo -n ${?} ) -eq 0 ]]; then
-        echo "correct"
+        #echo "correct"
         exit 0
     else
-        echo "incorrect"
+        #echo "incorrect"
         exit 1
     fi
 }
diff --git a/tools/locale.sh b/tools/locale.sh
@@ -15,15 +15,20 @@ _help() {
     echo "Scripts that perform locale-related processing " 
     echo
     echo " General command:"
-    echo "    check [name]       Determine if the locale is available"
-    echo "    show               Shows a list of available locales"
-    echo "    get [name]         Prints the specified locale settings"
-    echo "    help               This help message"
+    echo "    check [name]              Determine if the locale is available"
+    echo "    show                      Shows a list of available locales"
+    echo "    get [name]                Prints the specified locale settings"
+    echo "    help                      This help message"
     echo
     echo " General options:"
     echo "    -a | --arch [arch]        Specify the architecture"
     echo "    -c | --channel            Specify the channel"
+    echo "    -s | --script             Enable script mode"
     echo "    -h | --help               This help message"
+    echo
+    echo " Script mode usage:"
+    echo "     check                    Returns 0 if the check was successful, 1 otherwise."
+    printf '     get                      eval $(%s -s -a <arch> -c <channel> get <locale>)\n' "$(basename ${0})"
 }
 
 # Usage: getclm <number>
@@ -55,10 +60,10 @@ check() {
         exit 1
     fi
     if [[ $(printf '%s\n' "${localelist[@]}" | grep -qx "${1}"; echo -n ${?} ) -eq 0 ]]; then
-        echo "correct"
+        #echo "correct"
         exit 0
     else
-        echo "incorrect"
+        #echo "incorrect"
         exit 1
     fi
 }
diff --git a/tools/module.sh b/tools/module.sh
@@ -31,12 +31,15 @@ _help() {
     echo " General options:"
     echo "    -v | --version [ver]      Specifies the AlterISO version"
     echo "    -h | --help               This help message"
+    echo
+    echo " check exit code:"
+    echo "    0 (correct)  1 (incorrect)  2 (other)"
 }
 
 check(){
     if (( "${#}" == 0 )) || (( "${#}" >= 2 ));then
         _help
-        exit 1
+        exit 2
     fi
     local _version
     if [[ -f "${module_dir}/${1}/alteriso" ]]; then
@@ -46,10 +49,10 @@ check(){
             unset alteriso
         )"
         if (( "$(echo "${_version}" | cut -d "." -f 1)" == "$(echo "${alteriso_version}" | cut -d "." -f 1)" )); then
-            echo "correct"
+            exit 0
         fi
     else
-        echo "incorrect"
+        exit 1
     fi
 }
 
diff --git a/tools/package.py b/tools/package.py
@@ -22,11 +22,12 @@
 ]
 
 epilog = """
-script mode output:
-  latest        The latest package is installed
-  noversion     Failed to get the latest version of the package, but the package is installed
-  nomatch       The version of the package installed in local does not match one of the latest
-  failed        Package not installed
+exit code:
+  0 (latest)           The latest package is installed
+  1 (noversion)        Failed to get the latest version of the package, but the package is installed
+  2 (nomatch)          The version of the package installed in local does not match one of the latest
+  3 (failed)           Package not installed
+  4                    Other error
 """
 
 def msg_info(string):
@@ -54,30 +55,31 @@ def compare(package):
     pkg_from_sync = get_from_syncdb(package)
 
     if pkg_from_local is None:
-        if args.script:
-            return ["failed"]
-        else:
+        # failed
+        if not args.script:
             msg_error(f"{package} is not installed.")
-            return 1
+        return 3
+
     elif pkg_from_sync is None:
-        if args.script:
-            return ["noversion"]
-        else:
+        # noversion
+        if not args.script:
             msg_warn(f"Failed to get the latest version of {package}.")
-            return 1
-    
+        return 1
+
+    # スクリプトモード時にパッケージバージョンを表示    
+    if args.script:
+        print(pkg_from_local.version)
+
     if pkg_from_local.version == pkg_from_sync.version:
-        if args.script:
-            return ["latest", pkg_from_local.version]
-        else:
-            msg_info(f"The latest version of {package} is installed.")
-            return 0
+        # latest
+        if not args.script:
+            msg_info(f"The latest version of {package} {pkg_from_local.version} is installed.")
+        return 0
     else:
-        if args.script:
-            return ["nomatch", pkg_from_local.version, pkg_from_sync.version]
-        else:
+        # nomatch
+        if not args.script:
             msg_warn(f"The version of {package} does not match one of the latest.\nLocal: {pkg_from_local.version} Latest: {pkg_from_sync.version}")
-            return 1
+        return 2
 
 if __name__ == "__main__":
     script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -111,7 +113,7 @@ def compare(package):
             exit()
         else:
             msg_error("pyalpm is not installed.")
-            sys.exit(1)
+            sys.exit(4)
 
     handle = pyalpm.Handle(".", "/var/lib/pacman")
     
@@ -121,9 +123,12 @@ def compare(package):
     localdb = handle.get_localdb()
     syncdbs = handle.get_syncdbs()
     
-    if args.script:
-        result = compare(args.package)
-        print(" ".join(result))
-    else:
-        return_code = compare(args.package)
-        sys.exit(return_code)
+    #if args.script:
+    #    result = compare(args.package)
+    #    print(" ".join(result))
+    #else:
+    #    return_code = compare(args.package)
+    #    sys.exit(return_code)
+
+    return_code = compare(args.package)
+    sys.exit(return_code)
