Skip to content

Commit 291070c

Browse files
committed
Merge pull request #17 from tamagokun/default_timezone
moved default date setting into Pomander libs since the bin seems to
2 parents 886cfbc + d125536 commit 291070c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

bin/pom

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/usr/bin/env php
22
<?php
3-
if(function_exists('date_default_timezone_set')) date_default_timezone_set('UTC');
43
// pass arguments to phake
54
array_shift($GLOBALS['argv']);
65
$arg_list = implode(' ', $GLOBALS['argv']);

lib/Pomander/Environment.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public function __set($prop,$value) { $this->config[$prop] = $value; }
7070

7171
public function new_release()
7272
{
73+
if(function_exists('date_default_timezone_set')) date_default_timezone_set('UTC');
7374
return date('Ymdhis');
7475
}
7576

@@ -117,7 +118,7 @@ public function exec($cmd)
117118
if(!$this->target) return exec_cmd($cmd);
118119
if(!$this->shell)
119120
{
120-
$keypass = $this->key_pass;
121+
$keypass = $this->key_pass;
121122
$auth = is_null($this->password)? $this->key_path : $this->password;
122123
$user = is_null($this->user)? get_current_user : $this->user;
123124
$this->shell = new RemoteShell($this->target, $this->port, $user, $auth, $keypass);
@@ -161,7 +162,7 @@ private function defaults()
161162
"port"=>22,
162163
"umask"=>"002",
163164
"key_path"=>home()."/.ssh/id_rsa",
164-
"key_password"=>null,
165+
"key_password"=>null,
165166
"password"=>null,
166167
"rsync_cmd"=>"rsync",
167168
"rsync_flags"=>"-avuzPO --quiet",

0 commit comments

Comments
 (0)