!47 [sync] PR-45: fix errors found from shellcheck scan
From: @openeuler-sync-bot Reviewed-by: @licunlong Signed-off-by: @licunlong
This commit is contained in:
commit
057cc0d4f2
39
fix-errors-found-from-shellcheck-scan.patch
Normal file
39
fix-errors-found-from-shellcheck-scan.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From 731121ce199655c643ad8bbbec01a4d0efd9fa96 Mon Sep 17 00:00:00 2001
|
||||||
|
From: licunlong1 <licunlong1@huawei.com>
|
||||||
|
Date: Wed, 7 Sep 2022 17:09:00 +0800
|
||||||
|
Subject: [PATCH] fix errors found from shellcheck scan
|
||||||
|
|
||||||
|
---
|
||||||
|
plugins/demofiles.sh | 2 +-
|
||||||
|
rpmrebuild.sh | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/plugins/demofiles.sh b/plugins/demofiles.sh
|
||||||
|
index 7d3f029..7511fd9 100755
|
||||||
|
--- a/plugins/demofiles.sh
|
||||||
|
+++ b/plugins/demofiles.sh
|
||||||
|
@@ -40,7 +40,7 @@ function syntaxe () {
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
# test for arguments
|
||||||
|
-while [[ $ 1 ]]
|
||||||
|
+while [[ $1 ]]
|
||||||
|
do
|
||||||
|
case $1 in
|
||||||
|
-h | --help )
|
||||||
|
diff --git a/rpmrebuild.sh b/rpmrebuild.sh
|
||||||
|
index 1747e95..0f87963 100755
|
||||||
|
--- a/rpmrebuild.sh
|
||||||
|
+++ b/rpmrebuild.sh
|
||||||
|
@@ -507,7 +507,7 @@ function Main
|
||||||
|
CommandLineParsing "$@" || return
|
||||||
|
[ "x$NEED_EXIT" = "x" ] || return $NEED_EXIT
|
||||||
|
|
||||||
|
- Debug "rpmrebuild version $VERSION : $@"
|
||||||
|
+ Debug "rpmrebuild version $VERSION : $*"
|
||||||
|
|
||||||
|
check_i18ndomains
|
||||||
|
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: rpmrebuild
|
Name: rpmrebuild
|
||||||
Version: 2.15
|
Version: 2.15
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: A tool to build a rpm file from the rpm database
|
Summary: A tool to build a rpm file from the rpm database
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://rpmrebuild.sourceforge.net
|
URL: http://rpmrebuild.sourceforge.net
|
||||||
@ -8,6 +8,7 @@ Source0: https://downloads.sourceforge.net/rpmrebuild/%{name}-%{version}.
|
|||||||
|
|
||||||
Patch9000: bugfix-reset-defattr-when-users-want-to-keep-files-permissi.patch
|
Patch9000: bugfix-reset-defattr-when-users-want-to-keep-files-permissi.patch
|
||||||
Patch9001: fix-k-may-not-keep-uid-or-gid.patch
|
Patch9001: fix-k-may-not-keep-uid-or-gid.patch
|
||||||
|
Patch9002: fix-errors-found-from-shellcheck-scan.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
@ -59,6 +60,12 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/fr_FR.UTF-8/man1/
|
|||||||
%{_mandir}/fr/man1/*.gz
|
%{_mandir}/fr/man1/*.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 12 2024 dongyuzhen <dongyuzhen@h-partners.com> - 2.15-4
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix errors found from shellcheck scan
|
||||||
|
|
||||||
* Tue Oct 18 2022 dongyuzhen <dongyuzhen@h-partners.com> - 2.15-3
|
* Tue Oct 18 2022 dongyuzhen <dongyuzhen@h-partners.com> - 2.15-3
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user