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
commit 8948d51aaa8fb1964baa751f1be71f21cdca19fc Author: Sebb <s...@apache.org> AuthorDate: Sat Jun 13 00:35:57 2020 +0100 Revert "Eliminate unnecessary chdirs" This reverts commit e6bf67984c2c465386149760e3e154f9484b101c. --- www/board/agenda/routes.rb | 10 ++++++---- www/board/agenda/views/actions/publish.json.rb | 5 ++--- .../workbench/views/actions/rotate-attachment.json.rb | 4 +++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/www/board/agenda/routes.rb b/www/board/agenda/routes.rb index 98bf5c0..c209e40 100755 --- a/www/board/agenda/routes.rb +++ b/www/board/agenda/routes.rb @@ -499,10 +499,12 @@ get '/text/draft/:file' do |file| agenda.sub('_agenda_','_minutes_').sub('.txt','.yml') _text do - if Dir['board_agenda_*.txt', base: FOUNDATION_BOARD].include?(agenda) - _ Minutes.draft(agenda, minutes) - else - halt 404 + Dir.chdir(FOUNDATION_BOARD) do + if Dir['board_agenda_*.txt'].include?(agenda) + _ Minutes.draft(agenda, minutes) + else + halt 404 + end end end end diff --git a/www/board/agenda/views/actions/publish.json.rb b/www/board/agenda/views/actions/publish.json.rb index 841766d..2b31e8b 100755 --- a/www/board/agenda/views/actions/publish.json.rb +++ b/www/board/agenda/views/actions/publish.json.rb @@ -12,8 +12,7 @@ CALENDAR = File.join(BOARD_SITE, 'calendar.mdtext') # update from svn [MINUTES, BOARD_SITE, BOARD_PRIVATE].each do |dir| - ASF::SVN.svn('cleanup', dir) - ASF::SVN.svn('update', dir) # TODO does this need auth? + Dir.chdir(dir) {`svn cleanup`; `svn up`} end calendar = File.read(CALENDAR) @@ -86,4 +85,4 @@ ASF::SVN.update BOARD_PRIVATE, @message, env, _ do |tmpdir| end end -Dir['board_minutes_*.txt', base: BOARD_PRIVATE].sort +Dir.chdir(BOARD_PRIVATE) {Dir['board_minutes_*.txt'].sort} diff --git a/www/secretary/workbench/views/actions/rotate-attachment.json.rb b/www/secretary/workbench/views/actions/rotate-attachment.json.rb index 48f04bc..d1189b1 100644 --- a/www/secretary/workbench/views/actions/rotate-attachment.json.rb +++ b/www/secretary/workbench/views/actions/rotate-attachment.json.rb @@ -13,7 +13,9 @@ begin raise "Invalid direction #{@direction}" unless tool - Kernel.system tool, '--quiet', '--suffix', 'rotated', selected.path, chdir: File.dirname(selected.path) + Dir.chdir File.dirname(selected.path) do + Kernel.system tool, '--quiet', '--suffix', 'rotated', selected.path + end output = selected.path.sub(/\.pdf$/, '-rotated.pdf')