fix missing quotation in filetransfer.sh
Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com>
This commit is contained in:
parent
eee1990647
commit
63b73589ae
46
0004-fix-missing-quotation-in-filetransfer.sh.patch
Normal file
46
0004-fix-missing-quotation-in-filetransfer.sh.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
From b0c97adfda1dd3281e56e0813f9f1198af0b10d0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Qiumiao Zhang <zhangqiumiao1@huawei.com>
|
||||||
|
Date: Fri, 26 May 2023 22:24:51 +0800
|
||||||
|
Subject: [PATCH] fix missing quotation in filetransfer.sh
|
||||||
|
|
||||||
|
---
|
||||||
|
usr/Euler/project/load/filetransfer.sh | 10 +++++-----
|
||||||
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/usr/Euler/project/load/filetransfer.sh b/usr/Euler/project/load/filetransfer.sh
|
||||||
|
index 7066f25..7aa479d 100644
|
||||||
|
--- a/usr/Euler/project/load/filetransfer.sh
|
||||||
|
+++ b/usr/Euler/project/load/filetransfer.sh
|
||||||
|
@@ -72,7 +72,7 @@ function mountDirectory()
|
||||||
|
mountCheckPath="`echo $mountpoint | sed "s/[\/]\{2,\}/\//g" | sed "s/\/$//g"`"
|
||||||
|
|
||||||
|
#check bemountedpoint or mountpoint is already mounted
|
||||||
|
- if [ -n "` cat /proc/mounts | grep " $mountCheckPath " | grep $bemountedpoint`" ];then
|
||||||
|
+ if [ -n "`cat /proc/mounts | grep " $mountCheckPath " | grep $bemountedpoint`" ];then
|
||||||
|
g_LOG_Info "$mountCheckPath has been mounted"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
@@ -349,16 +349,16 @@ function parseUrl()
|
||||||
|
TMP_PARAMS=`echo ${serverUrl} | awk -F "?" '{print $2}'`
|
||||||
|
if [ -n "${TMP_PARAMS}" ]; then
|
||||||
|
tempPattern=`echo ${TMP_PARAMS} | awk -F "@" '{print $1}'`
|
||||||
|
- if echo "${tempPattern} | grep -q "^[u|U]=.*$"; then
|
||||||
|
+ if echo "${tempPattern}" | grep -q "^[u|U]=.*$"; then
|
||||||
|
userName=`echo ${tempPattern} | awk -F "=" '{print $2}'`
|
||||||
|
- elif echo "${tempPattern} | grep -q "^[p|P]=.*$"; then
|
||||||
|
+ elif echo "${tempPattern}" | grep -q "^[p|P]=.*$"; then
|
||||||
|
password=`echo ${tempPattern} | awk -F "=" '{print $2}'`
|
||||||
|
fi
|
||||||
|
|
||||||
|
tempPattern=`echo ${TMP_PARAMS} | awk -F "@" '{print $2}'`
|
||||||
|
- if echo "${tempPattern} | grep -q "^[u|U]=.*$"; then
|
||||||
|
+ if echo "${tempPattern}" | grep -q "^[u|U]=.*$"; then
|
||||||
|
userName=`echo ${tempPattern} | awk -F "=" '{print $2}'`
|
||||||
|
- elif echo "${tempPattern} | grep -q "^[p|P]=.*$"; then
|
||||||
|
+ elif echo "${tempPattern}" | grep -q "^[p|P]=.*$"; then
|
||||||
|
password=`echo ${tempPattern} | awk -F "=" '{print $2}'`
|
||||||
|
fi
|
||||||
|
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -3,12 +3,13 @@ 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: 7
|
Release: 8
|
||||||
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
|
||||||
|
|
||||||
Requires: kernel
|
Requires: kernel
|
||||||
BuildRequires: dos2unix coreutils findutils
|
BuildRequires: dos2unix coreutils findutils
|
||||||
@ -101,6 +102,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
|
||||||
|
* Fri May 26 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1.2-8
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix missing quotation in filetransfer.sh
|
||||||
|
|
||||||
* Fri May 5 2023 fengtao <fengtao40@huawei.com> - 1.2-7
|
* Fri May 5 2023 fengtao <fengtao40@huawei.com> - 1.2-7
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user