From 526a5d8f59f62ad64a9909fae0e021bc15584379 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Fri, 3 Apr 2015 09:57:02 -0500 Subject: [PATCH] Removes chmod/chown from scripts --- src/Dashbrew/Cli/Tasks/ConfigDefaultsTask.php | 8 ++++---- src/Dashbrew/Cli/Tasks/ConfigSyncTask.php | 10 +++++----- src/Dashbrew/Cli/Util/Config.php | 2 +- src/Dashbrew/Cli/Util/Projects.php | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Dashbrew/Cli/Tasks/ConfigDefaultsTask.php b/src/Dashbrew/Cli/Tasks/ConfigDefaultsTask.php index 00eb7fc..9eb7c82 100644 --- a/src/Dashbrew/Cli/Tasks/ConfigDefaultsTask.php +++ b/src/Dashbrew/Cli/Tasks/ConfigDefaultsTask.php @@ -48,7 +48,7 @@ public function run() { }; } - $fs->mkdir($config_sources_dirs, 0777, 'vagrant'); + $fs->mkdir($config_sources_dirs); foreach ($config_files as $file){ if(empty($file['default'])){ @@ -59,7 +59,7 @@ public function run() { $origin_file = $file['default']; if(!file_exists($target_file)){ $this->output->writeInfo("Writing default config file '$target_file'"); - $fs->copy($origin_file, $target_file, true, 'vagrant'); + $fs->copy($origin_file, $target_file, true); } } @@ -75,7 +75,7 @@ public function run() { } $this->output->writeInfo("Writing default config dir '$target_dir'"); - $fs->mkdir($target_dir, 0777, 'vagrant'); + $fs->mkdir($target_dir); $finder = new Finder; foreach($finder->files()->in($source_dir)->ignoreDotFiles(false)->depth('== 0') as $origin_dir_file){ $origin_dir_filename = $origin_dir_file->getFilename(); @@ -83,7 +83,7 @@ public function run() { $target_dir_filepath = $target_dir . '/' . $origin_dir_filename; $origin_dir_filepath = $source_dir . '/' . $origin_dir_filename; - $fs->copy($origin_dir_filepath, $target_dir_filepath, true, 'vagrant'); + $fs->copy($origin_dir_filepath, $target_dir_filepath, true); } } } diff --git a/src/Dashbrew/Cli/Tasks/ConfigSyncTask.php b/src/Dashbrew/Cli/Tasks/ConfigSyncTask.php index af17012..a26e26a 100644 --- a/src/Dashbrew/Cli/Tasks/ConfigSyncTask.php +++ b/src/Dashbrew/Cli/Tasks/ConfigSyncTask.php @@ -85,7 +85,7 @@ protected function syncFiles() { } $this->output->writeInfo("Syncing config file '$source_file' " . ($copy_from == $source_file ? "->" : "<-" ) . " '$target_file'"); - $fs->copy($copy_from, $copy_to, true, $copy_owner, $copy_group); + $fs->copy($copy_from, $copy_to, true); } } @@ -156,7 +156,7 @@ protected function syncDirs() { } $this->output->writeInfo("Syncing config file '$source_dir_filepath' " . ($copy_from == $source_dir_filepath ? "->" : "<-" ) . " '$target_dir_filepath'"); - $fs->copy($copy_from, $copy_to, true, $copy_owner, $copy_group); + $fs->copy($copy_from, $copy_to, true); } // Delete file from source dir else if(in_array($source_dir_filename, $dir_sync_status['old'])){ @@ -168,7 +168,7 @@ protected function syncDirs() { $dir_sync_status['new'][] = $source_dir_filename; $this->output->writeInfo("Copying config file '$source_dir_filepath' -> '$target_dir_filepath'"); - $fs->copy($source_dir_filepath, $target_dir_filepath, true, $target_dir_owner, $target_dir_group); + $fs->copy($source_dir_filepath, $target_dir_filepath, true); } } @@ -191,7 +191,7 @@ protected function syncDirs() { // Copy file to source dir else { $this->output->writeInfo("Copying config file '$source_dir_filepath' <- '$target_dir_filepath'"); - $fs->copy($target_dir_filepath, $source_dir_filepath, true, $source_dir_owner, $source_dir_group); + $fs->copy($target_dir_filepath, $source_dir_filepath, true); $dir_sync_status['new'][] = $target_dir_filename; } @@ -202,6 +202,6 @@ protected function syncDirs() { // Write status file $this->output->writeDebug("Writing config directories sync status file"); - $fs->write(self::SYNC_STATUS_FILE, json_encode($sync_status_new), 'vagrant'); + $fs->write(self::SYNC_STATUS_FILE, json_encode($sync_status_new)); } } diff --git a/src/Dashbrew/Cli/Util/Config.php b/src/Dashbrew/Cli/Util/Config.php index 5c84a38..c9abbba 100644 --- a/src/Dashbrew/Cli/Util/Config.php +++ b/src/Dashbrew/Cli/Util/Config.php @@ -132,7 +132,7 @@ public static function writeOld() { return; } - $fs->copy(self::CONFIG_FILE, self::CONFIG_FILE_OLD, true, 'vagrant'); + $fs->copy(self::CONFIG_FILE, self::CONFIG_FILE_OLD, true); } /** diff --git a/src/Dashbrew/Cli/Util/Projects.php b/src/Dashbrew/Cli/Util/Projects.php index 7c290f1..f2687ff 100644 --- a/src/Dashbrew/Cli/Util/Projects.php +++ b/src/Dashbrew/Cli/Util/Projects.php @@ -149,7 +149,7 @@ public static function writeCatalog($catalog) { $content = json_encode($catalog); if(!file_exists($file) || md5($content) !== md5_file($file)){ $fs = Util::getFilesystem(); - $fs->write($file, $content, 'vagrant'); + $fs->write($file, $content); return true; } @@ -168,7 +168,7 @@ public static function writeHosts($hosts) { $content = json_encode($hosts); if(!file_exists($file) || md5($content) !== md5_file($file)){ $fs = Util::getFilesystem(); - $fs->write($file, $content, 'vagrant'); + $fs->write($file, $content); return true; } @@ -187,7 +187,7 @@ public static function writeShortcuts($shortcuts) { $content = json_encode($shortcuts); if(!file_exists($file) || md5($content) !== md5_file($file)){ $fs = Util::getFilesystem(); - $fs->write($file, $content, 'vagrant'); + $fs->write($file, $content); return true; }