[whimsy] branch master updated: run n under sudo; version check for node; split out passenger

[rubys]

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

rubys 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 adfee24  run n under sudo; version check for node; split out passenger
adfee24 is described below

commit adfee24406e0a7349ea4800149665aa2b5cabb13
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Dec 7 19:00:01 2019 -0500

    run n under sudo; version check for node; split out passenger
---
 config/setupmymac | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/setupmymac b/config/setupmymac
index 7e59c8a..b1626bc 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -190,14 +190,19 @@ if not $root and option != :docker
     brew 'upgrade', 'n' 
   end
 
-  if `which node`.empty? or force[:node]
-    run 'n lts'
+  if `which node`.empty?
+    sudo { run 'n lts' }
+  elsif force[:node] and "v#{`n ls-remote stable`}" != `node --version`
+    sudo { run 'n lts' }
   end
 
   # Prompt for xcode installation
   `svn --version` unless $dry_run
+end
+
+## Install Passenger
 
-  # Install passenger
+if not $root and option != :docker
   if `which passenger`.empty?
     brew 'install', 'passenger'
   elsif force[:passenger]