support use %20 escape characters in url
Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com>
This commit is contained in:
parent
77d9bc4e57
commit
e17ca07440
49
0005-support-use-20-escape-characters-in-url.patch
Normal file
49
0005-support-use-20-escape-characters-in-url.patch
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
From d08e3843904fee9bfb955a928a55a2f08b8f054a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
|
||||||
|
Date: Tue, 15 Aug 2023 14:48:50 +0800
|
||||||
|
Subject: [PATCH] support use %20 escape characters in url
|
||||||
|
|
||||||
|
Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com>
|
||||||
|
---
|
||||||
|
usr/Euler/project/install/setupOS.sh | 4 ++--
|
||||||
|
usr/Euler/project/load/load.sh | 2 +-
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/usr/Euler/project/install/setupOS.sh b/usr/Euler/project/install/setupOS.sh
|
||||||
|
index f1040c4..f8a6f79 100644
|
||||||
|
--- a/usr/Euler/project/install/setupOS.sh
|
||||||
|
+++ b/usr/Euler/project/install/setupOS.sh
|
||||||
|
@@ -189,7 +189,7 @@ function SetupOS_Decompr()
|
||||||
|
|
||||||
|
#sha256sum check
|
||||||
|
if [ ! -z "$LOCAL_SOURCE_PATH" -a ! -z "$SI_OSTARNAME" -a -f "$LOCAL_SOURCE_PATH/$SI_OSTARNAME.sha256" ]; then
|
||||||
|
- pushd $LOCAL_SOURCE_PATH >> $OTHER_TTY 2>&1
|
||||||
|
+ pushd "$LOCAL_SOURCE_PATH" >> $OTHER_TTY 2>&1
|
||||||
|
sha256sum -c "$SI_OSTARNAME.sha256" >> $OTHER_TTY 2>&1
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
g_LOG_Info "sha256sum success."
|
||||||
|
@@ -211,7 +211,7 @@ function SetupOS_Decompr()
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- tar -xzf $LOCAL_SOURCE_PATH/$SI_OSTARNAME -C $LOCAL_UNCOMPRESS_PATH >> $OTHER_TTY 2>&1
|
||||||
|
+ tar -xzf "$LOCAL_SOURCE_PATH/$SI_OSTARNAME" -C "$LOCAL_UNCOMPRESS_PATH" >> $OTHER_TTY 2>&1
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
g_LOG_Error "uncompressed the $LOCAL_SOURCE_PATH/$SI_OSTARNAME failed."
|
||||||
|
return 1
|
||||||
|
diff --git a/usr/Euler/project/load/load.sh b/usr/Euler/project/load/load.sh
|
||||||
|
index 2f0a5d8..176bb1c 100644
|
||||||
|
--- a/usr/Euler/project/load/load.sh
|
||||||
|
+++ b/usr/Euler/project/load/load.sh
|
||||||
|
@@ -109,7 +109,7 @@ function g_Load_Os
|
||||||
|
|
||||||
|
if echo $tran_protocol | grep -q -E "^[fF][tT][pP]$|^[hH][tT][tT][pP]$"; then
|
||||||
|
if [ "x$FT_SERVER_SOURCE_PATH" != "x" ]; then
|
||||||
|
- LOCAL_SOURCE_PATH="$LOCAL_SOURCE_PATH/$FT_SERVER_SOURCE_PATH/repo"
|
||||||
|
+ LOCAL_SOURCE_PATH="$LOCAL_SOURCE_PATH/${FT_SERVER_SOURCE_PATH//%20/ }/repo"
|
||||||
|
else
|
||||||
|
LOCAL_SOURCE_PATH="$LOCAL_SOURCE_PATH/repo"
|
||||||
|
fi
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -3,13 +3,14 @@ Summary: scripts for system installation
|
|||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
License: MulanPSL-2.0
|
License: MulanPSL-2.0
|
||||||
Version: 1.2
|
Version: 1.2
|
||||||
Release: 8
|
Release: 9
|
||||||
SOURCE0: %{name}-%{version}.tar.gz
|
SOURCE0: %{name}-%{version}.tar.gz
|
||||||
|
|
||||||
Patch0001: 0001-add-support-for-nvme-disk.patch
|
Patch0001: 0001-add-support-for-nvme-disk.patch
|
||||||
Patch0002: 0002-support-mbsc.patch
|
Patch0002: 0002-support-mbsc.patch
|
||||||
Patch0003: 0003-remove-the-executable-permission-of-non-root-users-f.patch
|
Patch0003: 0003-remove-the-executable-permission-of-non-root-users-f.patch
|
||||||
Patch0004: 0004-fix-missing-quotation-in-filetransfer.sh.patch
|
Patch0004: 0004-fix-missing-quotation-in-filetransfer.sh.patch
|
||||||
|
Patch0005: 0005-support-use-20-escape-characters-in-url.patch
|
||||||
|
|
||||||
Requires: kernel
|
Requires: kernel
|
||||||
BuildRequires: dos2unix coreutils findutils
|
BuildRequires: dos2unix coreutils findutils
|
||||||
@ -102,6 +103,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
|
|||||||
%attr(0640,root,root) /etc/sysctl.d/01-euler-printk.conf
|
%attr(0640,root,root) /etc/sysctl.d/01-euler-printk.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 15 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1.2-9
|
||||||
|
- Type:requirement
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:support use %20 escape characters in url
|
||||||
|
|
||||||
* Fri May 26 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1.2-8
|
* Fri May 26 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1.2-8
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user