[jhalfs] branch trunk updated: Fix previous commit
| Newsgroups | gmane.linux.lfs.automated |
|---|---|
| Message-ID | <178695451509.3297810.3878705621757434246@rivendell.linuxfromscratch.org> |
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch trunk
in repository jhalfs.
The following commit(s) were added to refs/heads/trunk by this push:
new a76d857 Fix previous commit
a76d857 is described below
commit a76d857fd82454bd3677a7a210b1a996b272d7e0
Author: Pierre Labastie <[email protected]>
AuthorDate: Mon Aug 17 10:12:39 2026 +0200
Fix previous commit
The previous commit removed all lines not containing a `/' from
the zip listing. But if there are files and only one directory
the files are removed too. It is better to remove the first
(header) line, then use the preceding sed...
Report and patch by Zhang Wen. Applied with modifications
---
BLFS/xsl/scripts.xsl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl
index 4741f0b..913d8fc 100644
--- a/BLFS/xsl/scripts.xsl
+++ b/BLFS/xsl/scripts.xsl
@@ -1188,8 +1188,8 @@ case $PACKAGE in
JH_UNPACKDIR=`head -n1 unpacked | cut -d" " -f2 | sed 's@^\./@@;s@/.*@@'`
;;
*.zip)
- python3 -m zipfile -l $SRC_DIR/$PACKAGE > unpacked
- JH_UNPACKDIR="$(sed -n 's@/.*@@p' unpacked | uniq )"
+ python3 -m zipfile -l $SRC_DIR/$PACKAGE | sed 1d > unpacked
+ JH_UNPACKDIR="$(sed 's@/.*@@' unpacked | uniq )"
if test $(wc -w <<< $JH_UNPACKDIR) -eq 1; then
python3 -m zipfile -e $SRC_DIR/$PACKAGE .
else
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
--
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page