From: hayao <shun819.mail@gmail.com>
Date: Sun, 4 Oct 2020 13:03:45 +0000 (+0900)
Subject: [update] : Added exception handling when channel name is not specified
X-Git-Tag: rc3-alpha1~148
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d1d714fc95a9d542c722041a7755d5cd6ae7b1ec;p=alterlinux%2Falterlinux.git

[update] : Added exception handling when channel name is not specified
---

diff --git a/allarch.sh b/allarch.sh
index 50ea716d..97aa074e 100755
--- a/allarch.sh
+++ b/allarch.sh
@@ -1367,19 +1367,21 @@ msg_debug "Use the default configuration file (${defaultconfig})."
 set +eu
 
 # Check for a valid channel name
-case "$(bash "${script_path}/tools/channel.sh" -m check "${1}")" in
-    "incorrect")
-        msg_error "Invalid channel ${1}" "1"
-        ;;
-    "directory")
-        channel_dir="${1}"
-        channel_name="$(basename "${1%/}")"
-        ;;
-    "correct")
-        channel_dir="${script_path}/channels/${1}"
-        channel_name="${1}"
-        ;;
-esac
+if [[ -n "${1}" ]]; then
+    case "$(bash "${script_path}/tools/channel.sh" -m check "${1}")" in
+        "incorrect")
+            msg_error "Invalid channel ${1}" "1"
+            ;;
+        "directory")
+            channel_dir="${1}"
+            channel_name="$(basename "${1%/}")"
+            ;;
+        "correct")
+            channel_dir="${script_path}/channels/${1}"
+            channel_name="${1}"
+            ;;
+    esac
+fi
 
 # Set for special channels
 if [[ -d "${channel_dir}.add" ]]; then
@@ -1394,6 +1396,8 @@ elif [[ "${channel_name}" = "rebuild" ]]; then
 elif [[ "${channel_name}" = "clean" ]]; then
    "${script_path}/tools/clean.sh" -w $(realpath "${work_dir}") $([[ "${debug}" = true ]] && echo -n "-d")
     exit 0
+else
+    channel_dir="${script_path}/channels/${channel_name}"
 fi
 
 # Check channel version
diff --git a/build.sh b/build.sh
index 42344beb..5f242542 100755
--- a/build.sh
+++ b/build.sh
@@ -1449,19 +1449,21 @@ rebuildfile="${work_dir}/alteriso_config"
 set +eu
 
 # Check for a valid channel name
-case "$(bash "${script_path}/tools/channel.sh" check "${1}")" in
-    "incorrect")
-        msg_error "Invalid channel ${1}" "1"
-        ;;
-    "directory")
-        channel_dir="${1}"
-        channel_name="$(basename "${1%/}")"
-        ;;
-    "correct")
-        channel_dir="${script_path}/channels/${1}"
-        channel_name="${1}"
-        ;;
-esac
+if [[ -n "${1}" ]]; then
+    case "$(bash "${script_path}/tools/channel.sh" -m check "${1}")" in
+        "incorrect")
+            msg_error "Invalid channel ${1}" "1"
+            ;;
+        "directory")
+            channel_dir="${1}"
+            channel_name="$(basename "${1%/}")"
+            ;;
+        "correct")
+            channel_dir="${script_path}/channels/${1}"
+            channel_name="${1}"
+            ;;
+    esac
+fi
 
 # Set for special channels
 if [[ -d "${channel_dir}.add" ]]; then
@@ -1476,6 +1478,8 @@ elif [[ "${channel_name}" = "rebuild" ]]; then
 elif [[ "${channel_name}" = "clean" ]]; then
    "${script_path}/tools/clean.sh" -w $(realpath "${work_dir}") $([[ "${debug}" = true ]] && echo -n "-d")
     exit 0
+else
+    channel_dir="${script_path}/channels/${channel_name}"
 fi
 
 # Check channel version