From d615ebf5218e3600f78992cbedaddbdc3504c399 Mon Sep 17 00:00:00 2001 From: hayao Date: Sun, 12 Jul 2020 15:24:23 +0900 Subject: [PATCH] [add] : Added alteriso version check. --- build.sh | 22 +++++++++++++--------- channels/lxde/alteriso | 1 + channels/plasma/alteriso | 1 + channels/releng/alteriso | 1 + channels/xfce/alteriso | 1 + 5 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 channels/lxde/alteriso create mode 100644 channels/plasma/alteriso create mode 100644 channels/releng/alteriso create mode 100644 channels/xfce/alteriso diff --git a/build.sh b/build.sh index da5850cd..c90d4fcf 100755 --- a/build.sh +++ b/build.sh @@ -279,15 +279,17 @@ _usage () { echo echo " Channel:" - for i in $(ls -l "${script_path}"/channels/ | awk '$1 ~ /d/ {print $9 }'); do + for i in $(ls -l "${script_path}"/channels/ | awk '$1 ~ /d/ {print $9}'); do if [[ -n $(ls "${script_path}"/channels/${i}) ]]; then if [[ ! ${i} = "share" ]]; then - if [[ ! $(echo "${i}" | sed 's/^.*\.\([^\.]*\)$/\1/') = "add" ]]; then - if [[ ! -d "${script_path}/channels/${i}.add" ]]; then + if [[ "$(cat "${script_path}/channels/${i}/alteriso")" = "alteriso=3" ]]; then + if [[ ! $(echo "${i}" | sed 's/^.*\.\([^\.]*\)$/\1/') = "add" ]]; then + if [[ ! -d "${script_path}/channels/${i}.add" ]]; then + channel_list="${channel_list[@]} ${i}" + fi + else channel_list="${channel_list[@]} ${i}" fi - else - channel_list="${channel_list[@]} ${i}" fi fi fi @@ -1512,12 +1514,14 @@ if [[ -n "${1}" ]]; then for i in $(ls -l "${script_path}"/channels/ | awk '$1 ~ /d/ {print $9 }'); do if [[ -n $(ls "${script_path}"/channels/${i}) ]]; then if [[ ! ${i} = "share" ]]; then - if [[ ! $(echo "${i}" | sed 's/^.*\.\([^\.]*\)$/\1/') = "add" ]]; then - if [[ ! -d "${script_path}/channels/${i}.add" ]]; then + if [[ "$(cat "${script_path}/channels/${i}/alteriso")" = "alteriso=3" ]]; then + if [[ ! $(echo "${i}" | sed 's/^.*\.\([^\.]*\)$/\1/') = "add" ]]; then + if [[ ! -d "${script_path}/channels/${i}.add" ]]; then + channel_list="${channel_list[@]} ${i}" + fi + else channel_list="${channel_list[@]} ${i}" fi - else - channel_list="${channel_list[@]} ${i}" fi fi fi diff --git a/channels/lxde/alteriso b/channels/lxde/alteriso new file mode 100644 index 00000000..c7ecb859 --- /dev/null +++ b/channels/lxde/alteriso @@ -0,0 +1 @@ +alteriso=3 \ No newline at end of file diff --git a/channels/plasma/alteriso b/channels/plasma/alteriso new file mode 100644 index 00000000..c7ecb859 --- /dev/null +++ b/channels/plasma/alteriso @@ -0,0 +1 @@ +alteriso=3 \ No newline at end of file diff --git a/channels/releng/alteriso b/channels/releng/alteriso new file mode 100644 index 00000000..c7ecb859 --- /dev/null +++ b/channels/releng/alteriso @@ -0,0 +1 @@ +alteriso=3 \ No newline at end of file diff --git a/channels/xfce/alteriso b/channels/xfce/alteriso new file mode 100644 index 00000000..c7ecb859 --- /dev/null +++ b/channels/xfce/alteriso @@ -0,0 +1 @@ +alteriso=3 \ No newline at end of file -- 2.11.0