summaryrefslogtreecommitdiffstats
path: root/lib/gce_command.rb
diff options
context:
space:
mode:
authorAkram Ben Aissi <akram@free.fr>2015-01-28 04:14:27 -0500
committerLénaïc Huard <lhuard@amadeus.com>2015-02-19 17:59:44 +0100
commit5090e93a9af43996407dc36f6c2a549d7e83d787 (patch)
tree73eac1fd7049f365744fd6a5723a4b6bb3b3a875 /lib/gce_command.rb
parent81db3db61f911cbbc6ff8f88b90cecb870c41381 (diff)
downloadopenshift-5090e93a9af43996407dc36f6c2a549d7e83d787.tar.gz
openshift-5090e93a9af43996407dc36f6c2a549d7e83d787.tar.bz2
openshift-5090e93a9af43996407dc36f6c2a549d7e83d787.tar.xz
openshift-5090e93a9af43996407dc36f6c2a549d7e83d787.zip
Allows it to run on OSX
- Versions of ruby ported on OSX requires escaping of hyphens in regexp - Adds documentation on packages required by OSX to run openshift-online-ansible on OSX
Diffstat (limited to 'lib/gce_command.rb')
-rw-r--r--lib/gce_command.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gce_command.rb b/lib/gce_command.rb
index b0a84d27b..ac01a7f00 100644
--- a/lib/gce_command.rb
+++ b/lib/gce_command.rb
@@ -137,7 +137,7 @@ module OpenShift
:desc => 'A relative path where files are written to.'
desc "scp_from", "scp files from an instance"
def scp_from(*ssh_ops, host)
- if host =~ /^([\w\d_.-]+)@([\w\d-_.]+)$/
+ if host =~ /^([\w\d_.\-]+)@([\w\d\-_.]+)$/
user = $1
host = $2
end
@@ -169,7 +169,7 @@ module OpenShift
desc "ssh", "Ssh to an instance"
def ssh(*ssh_ops, host)
- if host =~ /^([\w\d_.-]+)@([\w\d-_.]+)/
+ if host =~ /^([\w\d_.\-]+)@([\w\d\-_.]+)/
user = $1
host = $2
end