summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2006-10-18 13:33:47 +0000
committerweasel <weasel@bc3d92e2-beff-0310-a7cd-cc87d7ac0ede>2006-10-18 13:33:47 +0000
commit9113c840e7320a57fda87023ce41b6ad117d500a (patch)
tree07c26850afc66d47470b23fb34cb765498b640a5
parent74c873480b24e36e6b9afe514190aa97b449172b (diff)
root and slashes
git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@208 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede
-rwxr-xr-xbin/weblogs-merge8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/weblogs-merge b/bin/weblogs-merge
index 6f5c8df..016fb92 100755
--- a/bin/weblogs-merge
+++ b/bin/weblogs-merge
@@ -26,7 +26,7 @@ ARGV.options do |opts|
opts.parse!
end
-root = '/srv/www/vhosts'
+root = '/srv/www/vhosts/'
dir = "/logs-archive/"
year = Time.new.year.to_s
@@ -43,17 +43,17 @@ Dir.glob("*").each{ |client|
Dir.chdir(client+dir)
if $VERBOSE then
- puts 'pwd :'+root+client+dir
+ puts 'pwd :'+root+"/"+client+"/"+dir
end
- if ! File.writable?(root+client+dir) then
+ if ! File.writable?(root+"/"+client+"/"+dir) then
puts 'log dir not writeable'
exit 1
end
files = Array.new
- Find.find(root+client+dir) { |file|
+ Find.find(root+"/"+client+"/"+dir) { |file|
if File.file?(file) then
files.push(file);
end