[whimsy] branch master updated: Use File.join for pathname construction

[sebb]

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 7c06bdb  Use File.join for pathname construction
7c06bdb is described below

commit 7c06bdb9712f053105c0f484ca497f8d81b53949
Author: Sebb <s...@apache.org>
AuthorDate: Sun Feb 14 13:59:12 2021 +0000

    Use File.join for pathname construction
---
 Rakefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index ac25e01..eb706ee 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,13 +30,15 @@ task :update, [:command] do |task, args|
 
   # locate system ruby
   sysruby = File.realpath(`which ruby`.chomp)
-  sysruby = "#{File.dirname(sysruby)}/%s#{sysruby[/ruby([.\d]*)$/, 1]}"
+  # N.B. The %s is used to insert related commands such as 'bundle' later on
+  sysruby = File.join(File.dirname(sysruby), "%s#{sysruby[/ruby([.\d]*)$/, 
1]}")
 
   # locate passenger ruby
   conf = Dir['/etc/apache2/*/passenger.conf'].first
   ruby = File.read(conf)[/PassengerRuby "?(.*?)"?$/, 1] if conf
   if ruby
-    passruby = "#{File.dirname(ruby)}/%s#{ruby[/ruby([.\d]*)$/, 1]}"
+    # create the base format string
+    passruby = File.join(File.dirname(ruby), "%s#{ruby[/ruby([.\d]*)$/, 1]}")
   else
     passruby = sysruby
   end
@@ -81,7 +83,7 @@ task :update, [:command] do |task, args|
       ruby = File.read('Gemfile')[/^ruby ['"](.*?)['"]/, 1]
       ruby = `which ruby#{ruby}`.chomp if ruby
       if ruby and not ruby.empty?
-        bundler = "#{File.dirname(ruby)}/bundle#{ruby[/ruby([.\d]*)$/, 1]}"
+        bundler = File.join(File.dirname(ruby), "bundle#{ruby[/ruby([.\d]*)$/, 
1]}")
       else
         bundler = (File.exist?('config.ru') ? passruby : sysruby) % 'bundle'
       end