[whimsy] branch master updated: Duh! no wonder we have issues

[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 62e9222e Duh! no wonder we have issues
62e9222e is described below

commit 62e9222ed88ca9a1089b1bed35ab826583c0ce86
Author: Sebb <se...@apache.org>
AuthorDate: Thu Apr 7 15:01:46 2022 +0100

    Duh! no wonder we have issues
---
 www/board/agenda/Rakefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/www/board/agenda/Rakefile b/www/board/agenda/Rakefile
index d55bbda9..b87736dc 100644
--- a/www/board/agenda/Rakefile
+++ b/www/board/agenda/Rakefile
@@ -4,8 +4,8 @@ $LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
 
 # Remove world writable directories that Travis may insert into the PATH,
 # as these cause security errors during testing
-ENV['PATH'] = ENV['PATH'].split(File::PATH_SEPARATOR).
-  reject {|path| File.world_writable? path}.join(File::PATH_SEPARATOR)
+# ENV['PATH'] = ENV['PATH'].split(File::PATH_SEPARATOR).
+#   reject {|path| File.world_writable? path}.join(File::PATH_SEPARATOR)
 
 require 'whimsy/asf/config'
 
@@ -60,9 +60,9 @@ file 'package-lock.json' => 'package.json' do
   sh 'type npm || true' # TEMP CHECK
   sh 'which -a npm || true' # TEMP CHECK
   sh 'echo $PATH' # TEMP CHECK
-  npm = ENV['NPM_PATH']
-  puts npm
-  sh "#{npm} install"
+  npm_base = File.dir(ENV['NPM_PATH'])
+  puts npm_base
+  sh 'npm install'
   sh 'touch package-lock.json'
 end