From 9ecac05c3bc917c70f81432211dfca11fa1fadba Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Mon, 2 Aug 2021 18:31:05 +0800
Subject: [PATCH] update repos

---
 script/step/make_iso.sh            | 4 ++--
 script/step/make_iso_everysrc.sh   | 3 ++-
 script/step/make_iso_everything.sh | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/script/step/make_iso.sh b/script/step/make_iso.sh
index 4977346..419b22b 100644
--- a/script/step/make_iso.sh
+++ b/script/step/make_iso.sh
@@ -36,13 +36,13 @@ function make_iso_inchroot()
     fi
     yum install oemaker lorax -y -c "${yum_conf}"
     cd /opt/oemaker
-
+    REPOS=`echo "${OBS_STANDARD_REPO_URL} ${OBS_STANDARD_THIRD_REPO_URL}" | sed 's/[ \t]*$//g'`
     set +e
     num=0
     set +u
     while [ "${num}" -lt 3 ]
     do
-        bash -x oemaker -t standard -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL} ${OBS_STANDARD_THIRD_REPO_URL}"
+        bash -x oemaker -t standard -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${REPOS}"
         if [ $? -eq 0 ];then
             break
         elif [ $? -eq 133 ]; then
diff --git a/script/step/make_iso_everysrc.sh b/script/step/make_iso_everysrc.sh
index bc879a2..01d1b2f 100644
--- a/script/step/make_iso_everysrc.sh
+++ b/script/step/make_iso_everysrc.sh
@@ -44,11 +44,12 @@ function make_iso_everysrc_inchroot()
     done
     sed -i '/parse_rpmlist_xml \"conflict\"/d' rpm.sh
     OBS_STANDARD_REPO_URL=${OBS_STANDARD_REPO_URL%/*}
+    REPOS=`echo "${OBS_STANDARD_REPO_URL}/standard_aarch64 ${OBS_STANDARD_REPO_URL}/standard_x86_64 ${OBS_STANDARD_THIRD_REPO_URL}" | sed 's/[ \t]*$//g'`
     set +e
     num=0
     while [ "${num}" -lt 3 ]
     do
-        bash -x oemaker -t everything_src -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL}/standard_aarch64 ${OBS_STANDARD_REPO_URL}/standard_x86_64 ${OBS_STANDARD_THIRD_REPO_URL}"
+        bash -x oemaker -t everything_src -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${REPOS}"
         if [ $? -eq 0 ];then
             break
         elif [ $? -eq 133 ]; then
diff --git a/script/step/make_iso_everything.sh b/script/step/make_iso_everything.sh
index 2efdb41..94e4178 100644
--- a/script/step/make_iso_everything.sh
+++ b/script/step/make_iso_everything.sh
@@ -44,12 +44,12 @@ function make_iso_everything_inchroot()
     do
         sed -i '/<packagelist type="exclude">/a\        <packagereq>'$rpmsname'</packagereq>' config/rpmlist.xml
     done
-
+    REPOS=`echo "${OBS_STANDARD_REPO_URL} ${OBS_STANDARD_THIRD_REPO_URL}" | sed 's/[ \t]*$//g'`
     set +e
     num=0
     while [ "${num}" -lt 3 ]
     do
-        bash -x oemaker -t everything -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL} ${OBS_STANDARD_THIRD_REPO_URL}"
+        bash -x oemaker -t everything -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${REPOS}"
         if [ $? -eq 0 ];then
             break
         elif [ $? -eq 133 ]; then
-- 
Gitee