From 99d2f0b9cb4bcb79d3c40e9448e1f60872deac80 Mon Sep 17 00:00:00 2001 From: liujiangbin11 Date: Thu, 13 Mar 2025 15:59:10 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=20oedp=20=E5=8C=85?= =?UTF-8?q?=E4=B8=BA=E4=B8=8D=E5=8C=BA=E5=88=86=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oedp/build/build.sh | 4 ++-- oedp/build/constants.sh | 2 +- oedp/build/oedp.spec | 20 ++++++++++++++++++-- oedp/build/static/oeDeploy.desktop | 2 +- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/oedp/build/build.sh b/oedp/build/build.sh index a227b6a..b59d30a 100644 --- a/oedp/build/build.sh +++ b/oedp/build/build.sh @@ -37,8 +37,8 @@ cd "${WORKSPACE_DIR}" [ ! -d "${STORAGE_DIR}" ] && mkdir "${STORAGE_DIR}" sub_dir=$(date +'%Y%m%d%H%M') mkdir "${STORAGE_DIR}/${sub_dir}" -cp -f ~/rpmbuild/RPMS/$(arch)/*.rpm "${STORAGE_DIR}/${sub_dir}" -rpm_name=$(ls ~/rpmbuild/RPMS/$(arch)) +find ~/rpmbuild/RPMS/ -type f -exec cp -f {} "${STORAGE_DIR}/${sub_dir}" \; +rpm_name=$(ls "${STORAGE_DIR}/${sub_dir}") echo -e "\e[1;32m [INFO] RPM is stored in ${STORAGE_DIR}/${sub_dir}/${rpm_name} \e[0m" echo -e "\e[1;32m [INFO] Start to clean up environment \e[0m" diff --git a/oedp/build/constants.sh b/oedp/build/constants.sh index 66a8327..dfe880d 100644 --- a/oedp/build/constants.sh +++ b/oedp/build/constants.sh @@ -26,5 +26,5 @@ BUILD_SCRIPT_DIR="${PROJECT_DIR}"/build # 存放构建中间产物的暂存目录 TEMP_DIR="${PROJECT_DIR}"/temp # 打包目录 -PACKING_DIR_NAME=oedp-1.0.0 +PACKING_DIR_NAME=oedp-1.0.1 PACKING_DIR="${TEMP_DIR}/${PACKING_DIR_NAME}" \ No newline at end of file diff --git a/oedp/build/oedp.spec b/oedp/build/oedp.spec index e04043a..6b23f60 100644 --- a/oedp/build/oedp.spec +++ b/oedp/build/oedp.spec @@ -1,11 +1,13 @@ %define _python_bytecompile_errors_terminate_build 0 Name: oedp -Version: 1.0.0 +Version: 1.0.1 Release: release_number Summary: openEuler deploy tool License: MulanPSL-2.0 Source0: %{name}-%{version}.tar.gz +BuildArch: noarch + Requires: python3, ansible, python3-prettytable %description @@ -57,4 +59,18 @@ fi %attr(0500,root,root) %{_usr}/lib/oedp/src/* %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/oedp/config/log.conf %attr(0755,root,root) %{_usr}/share/applications/* -%attr(0500,root,root) %{_bindir}/oedp \ No newline at end of file +%attr(0500,root,root) %{_bindir}/oedp + + +%changelog +* Wed Mar 12 2025 Liu Jiangbin - 1.0.1-1 +- Updated icon click effects on DevStation. +- Added upgrade support for the oedp package. +- Fixed exceptions caused by missing 'tasks' field. +- Fixed other known issues. + +* Mon Mar 3 2025 Liu Jiangbin - 1.0.0-2 +- fix the issue of abnormal termination during the script execution phase after installation + +* Sat Feb 22 2025 Liu Jiangbin - 1.0.0-1 +- init package \ No newline at end of file diff --git a/oedp/build/static/oeDeploy.desktop b/oedp/build/static/oeDeploy.desktop index 84ee549..251ebcf 100644 --- a/oedp/build/static/oeDeploy.desktop +++ b/oedp/build/static/oeDeploy.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=1.0.0 +Version=1.0.1 Type=Application Name=oeDeploy Exec=xdg-open /usr/share/applications/oeDeploy.html -- Gitee