From 4a55d85a2d8ca03734039fe3cfae57558d96bab7 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 19 Apr 2012 20:03:09 +0200 Subject: [PATCH] Respect umask in chmod calls --- src/Composer/Command/SelfUpdateCommand.php | 2 +- src/Composer/Installer/LibraryInstaller.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Composer/Command/SelfUpdateCommand.php b/src/Composer/Command/SelfUpdateCommand.php index f741beeca..16f92babd 100644 --- a/src/Composer/Command/SelfUpdateCommand.php +++ b/src/Composer/Command/SelfUpdateCommand.php @@ -53,7 +53,7 @@ EOT $rfs->copy('getcomposer.org', $remoteFilename, $tempFilename); try { - chmod($tempFilename, 0755); + chmod($tempFilename, 0777 & ~umask()); // test the phar validity $phar = new \Phar($tempFilename); // free the variable to unlock the file diff --git a/src/Composer/Installer/LibraryInstaller.php b/src/Composer/Installer/LibraryInstaller.php index 9e321df19..d690c357b 100644 --- a/src/Composer/Installer/LibraryInstaller.php +++ b/src/Composer/Installer/LibraryInstaller.php @@ -152,7 +152,7 @@ class LibraryInstaller implements InstallerInterface // likely leftover from a previous install, make sure // that the target is still executable in case this // is a fresh install of the vendor. - chmod($link, 0755); + chmod($link, 0777 & ~umask()); } $this->io->write('Skipped installation of '.$bin.' for package '.$package->getName().', name conflicts with an existing file'); continue; @@ -163,7 +163,7 @@ class LibraryInstaller implements InstallerInterface // add unixy support for cygwin and similar environments if ('.bat' !== substr($bin, -4)) { file_put_contents($link, $this->generateUnixyProxyCode($bin, $link)); - chmod($link, 0755); + chmod($link, 0777 & ~umask()); $link .= '.bat'; } file_put_contents($link, $this->generateWindowsProxyCode($bin, $link)); @@ -177,7 +177,7 @@ class LibraryInstaller implements InstallerInterface } } - chmod($link, 0755); + chmod($link, 0777 & ~umask()); } }