summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-06-14 06:11:46 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-06-14 06:11:46 +0000
commit270cea83439984563e63d40ed315f25525708126 (patch)
treef31fa85e7fea48260ad2a2e24d00da1ed112b584
parent8003320eaa5eb4e4084e3463282e8b1226411ae4 (diff)
downloadpuppet-270cea83439984563e63d40ed315f25525708126.tar.gz
puppet-270cea83439984563e63d40ed315f25525708126.tar.xz
puppet-270cea83439984563e63d40ed315f25525708126.zip
Fixing #644 -- the install.rb file works again
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2580 980ebf18-57e1-0310-9a29-db15c13687c0
-rwxr-xr-xinstall.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/install.rb b/install.rb
index 0bfb706f4..7e84bfceb 100755
--- a/install.rb
+++ b/install.rb
@@ -172,6 +172,7 @@ def prepare_installation
FileUtils.makedirs(sitelibdir)
else
bindir = Config::CONFIG['bindir']
+ sbindir = Config::CONFIG['sbindir']
tmpdirs << Config::CONFIG['bindir']
end
@@ -288,7 +289,6 @@ def install_binfile(from, op_file, target)
installed_wrapper = true
end
end
- p target
FileUtils.install(tmp_file, File.join(target, op_file), :mode => 0755, :verbose => true)
File.unlink(tmp_file)
end