[whimsy] branch master updated: Use File.join to construct file names

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 39ab1b8  Use File.join to construct file names
39ab1b8 is described below

commit 39ab1b8a3bde8416dd44cd78bd4f371c7e2381c0
Author: Sebb <se...@apache.org>
AuthorDate: Wed Jun 10 16:15:05 2020 +0100

    Use File.join to construct file names
---
 www/board/agenda/views/actions/draft.json.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/board/agenda/views/actions/draft.json.rb b/www/board/agenda/views/actions/draft.json.rb
index 5b6e1a6..7879baa 100644
--- a/www/board/agenda/views/actions/draft.json.rb
+++ b/www/board/agenda/views/actions/draft.json.rb
@@ -13,11 +13,11 @@ ASF::SVN.update minutes_file, @message, env, _ do |tmpdir, old_contents|
     # retrieve the agenda on which these minutes are based
     _.system ['svn', 'update',
       ['--username', env.user, '--password', env.password],
-      "#{tmpdir}/#{File.basename agenda_file}"]
+      File.join(tmpdir, File.basename(agenda_file))]
 
     # copy the agenda to the minutes (produces better diff)
     _.system ['svn', 'cp', "#{tmpdir}/#{@agenda}",
-      "#{tmpdir}/#{File.basename minutes_file}"]
+      File.join(tmpdir, File.basename(minutes_file))]
 
     @text
   end