summaryrefslogtreecommitdiffstats
path: root/install.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-18 23:27:07 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-18 23:27:07 +0000
commit7d1f7606c38ad7b32651e8bc98e2258feda99294 (patch)
treef40dc7c2461a314a238c3c48325f8b8e25f3e2a7 /install.rb
parent611f88a94ea4d91d8f8ddc95e4e54911ad29c0ca (diff)
downloadpuppet-7d1f7606c38ad7b32651e8bc98e2258feda99294.tar.gz
puppet-7d1f7606c38ad7b32651e8bc98e2258feda99294.tar.xz
puppet-7d1f7606c38ad7b32651e8bc98e2258feda99294.zip
Adding the execute bit to install.rb and fixing #473 -- there was a /win/ regex that matched darwin but was just supposed to match windows
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2527 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'install.rb')
-rwxr-xr-x[-rw-r--r--]install.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/install.rb b/install.rb
index e2dd9a4c4..b89f68fe1 100644..100755
--- a/install.rb
+++ b/install.rb
@@ -255,7 +255,7 @@ def install_binfile(from, op_file, target)
end
end
- if Config::CONFIG["target_os"] =~ /win/io
+ if Config::CONFIG["target_os"] =~ /win/io and Config::CONFIG["target_os"] !~ /darwin/io
installed_wrapper = false
if File.exists?("#{from}.bat")