From 988468bc82f05b424804966ca21ace1595bc1150 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 22 Oct 2020 20:24:23 +0200 Subject: [PATCH] fix packing path for dir --- Utils/IO/Zip/Tar.php | 2 +- Utils/IO/Zip/Zip.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Utils/IO/Zip/Tar.php b/Utils/IO/Zip/Tar.php index 62a859792..1d873d2c3 100644 --- a/Utils/IO/Zip/Tar.php +++ b/Utils/IO/Zip/Tar.php @@ -70,7 +70,7 @@ class Tar implements ArchiveInterface $absolute = \realpath($file); $absolute = \str_replace('\\', '/', (string) $absolute); - $dir = \str_replace($source . '/', '', \rtrim($relative, '/\\') . '/' . \ltrim($absolute, '/\\')); + $dir = \rtrim($relative, '/\\') . '/' . \ltrim(\str_replace($source . '/', '', $absolute), '/\\'); if (\is_dir($absolute)) { $tar->addEmptyDir($dir . '/'); diff --git a/Utils/IO/Zip/Zip.php b/Utils/IO/Zip/Zip.php index b4f736878..1ff00136f 100644 --- a/Utils/IO/Zip/Zip.php +++ b/Utils/IO/Zip/Zip.php @@ -75,7 +75,7 @@ class Zip implements ArchiveInterface $absolute = \realpath($file); $absolute = \str_replace('\\', '/', (string) $absolute); - $dir = \str_replace($source . '/', '', \rtrim($relative, '/\\') . '/' . \ltrim($absolute, '/\\')); + $dir = \rtrim($relative, '/\\') . '/' . \ltrim(\str_replace($source . '/', '', $absolute), '/\\'); if (\is_dir($absolute)) { $zip->addEmptyDir($dir . '/');