diff --git a/src/MakePhar/Manifest.php b/src/MakePhar/Manifest.php index 4b34fc4..b99d875 100644 --- a/src/MakePhar/Manifest.php +++ b/src/MakePhar/Manifest.php @@ -211,10 +211,10 @@ class Manifest $it = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($source->path)); foreach ($it as $item) { if ($item->isDir()) continue; - $items[] = (object)['src'=>$item->getPathname(),'dest'=>null]; + $items[] = (object)['src'=>realpath($item->getPathname()),'dest'=>$item->getPathname()]; } } elseif ($source->type == 'file') { - $items[] = (object)['src'=>$source->path,'dest'=>null]; + $items[] = (object)['src'=>realpath($source->path),'dest'=>$item->getPathname()]; } else { log_warn("Unsupported source type: %s", $source->type); } diff --git a/src/MakePhar/PharBuilder.php b/src/MakePhar/PharBuilder.php index c342f0e..76efd9c 100644 --- a/src/MakePhar/PharBuilder.php +++ b/src/MakePhar/PharBuilder.php @@ -52,7 +52,7 @@ class PharBuilder $size_tot = 0; $size_min = 0; foreach ($this->files as $file) { $i++; - $tp = dirname($file->src); + $tp = dirname($file->dest); if (($tp!=$lp) && (IS_TTY)) { $lp=$tp; printf("\r\e[K%d/%d %s", $i, $t, $tp); @@ -66,7 +66,7 @@ class PharBuilder } else { $size_tot += filesize($file->src); $size_min += filesize($file->src); - $phar->addFile($file->dest?:$file->src, $file->src); + $phar->addFile($file->src, $file->dest); } } (IS_TTY) && printf("\r\e[K");