49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
From 7b54410319d5d46e3c098237d1574c711269e90e Mon Sep 17 00:00:00 2001
|
|
From: yixiangzhike <yixiangzhike007@163.com>
|
|
Date: Mon, 22 Jul 2024 19:36:14 +0800
|
|
Subject: [PATCH] avoid truncate trailer space and do not escape
|
|
backslash when read filename
|
|
|
|
---
|
|
rpmrebuild_files.sh | 4 ++--
|
|
rpmrebuild_rpmqf.src | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/rpmrebuild_files.sh b/rpmrebuild_files.sh
|
|
index 30955c0..a7504d3 100755
|
|
--- a/rpmrebuild_files.sh
|
|
+++ b/rpmrebuild_files.sh
|
|
@@ -83,7 +83,7 @@ while :; do
|
|
read file_verify
|
|
read file_lang
|
|
read file_cap
|
|
- read file
|
|
+ read -r file
|
|
|
|
# on fedora 33, centos 7, 8, the root directory "/" is owned by filesystem package
|
|
# but for rpmrebuild, BUILDROOT is juste a symlink, not a directory (cf RpmBuild in rpmrebuild.sh)
|
|
@@ -257,6 +257,6 @@ while :; do
|
|
esac
|
|
fi
|
|
|
|
- echo "${miss_str}${lang_str}${dir_str}${fflags_str}${attr_str}${caps_str}${verify_str}\"${file}\""
|
|
+ echo "${miss_str}${lang_str}${dir_str}${fflags_str}${attr_str}${caps_str}${verify_str}${file}"
|
|
done || Critical "$MY_BASENAME done"
|
|
exit 0
|
|
diff --git a/rpmrebuild_rpmqf.src b/rpmrebuild_rpmqf.src
|
|
index 04d62ea..c646842 100755
|
|
--- a/rpmrebuild_rpmqf.src
|
|
+++ b/rpmrebuild_rpmqf.src
|
|
@@ -137,7 +137,7 @@ echo '[%{FILEMODES:perms}\
|
|
%{FILEVERIFYFLAGS:octal}\
|
|
%{FILELANGS}\
|
|
%{FILECAPS}\
|
|
-%{FILENAMES}\
|
|
+\"%{FILENAMES}\"\
|
|
]'
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|