even more data collection

Author: ianfixes

lib/arduino_ci/host.rb

@@ -45,21 +45,34 @@ def self.os
     def self.symlink(old_path, new_path)
       return FileUtils.ln_s(old_path.to_s, new_path.to_s) unless RUBY_PLATFORM =~ /mswin32|cygwin|mingw|bccwin/
 
+      op = old_path
+      orp = old_path.realpath
+      STDERR.puts "Old path     #{op} #{op.exist?}"
+      STDERR.puts "Old realpath #{orp} #{orp?}"
+
       # windows mklink syntax is reverse of unix ln -s
       # windows mklink is built into cmd.exe
       # vulnerable to command injection, but okay because this is a hack to make a cli tool work.
-      stdout, stderr, exitstatus = Open3.capture3('cmd.exe', "/c mklink /D #{new_path} #{old_path}")
+      stdout, stderr, exitstatus = Open3.capture3('cmd.exe', "/C mklink /D #{new_path} #{old_path.realpath}")
+      STDERR.puts stdout
+      STDERR.puts stderr
+      return exitstatus if new_path.exist?
+
+      STDERR.puts "initial try failed, trying short runas"
+
+      stdout, stderr, exitstatus = Open3.capture3('runas.exe', "/user:administrator", "mklink /D #{new_path} #{orp}")
+
       STDERR.puts stdout
       STDERR.puts stderr
       return exitstatus if new_path.exist?
 
-      STDERR.puts "initial try failed, trying elevated"
+      STDERR.puts "initial try failed, trying long runas"
 
-      stdout, stderr, exitstatus = Open3.capture3('runas.exe', "/user:administrator", "cmd /C mklink /D #{new_path} #{old_path}")
+      stdout, stderr, exitstatus = Open3.capture3('runas.exe', "/user:administrator", "cmd /C mklink /D #{new_path} #{orp}")
 
       STDERR.puts stdout
       STDERR.puts stderr
-      return exitstatus
+      exitstatus
     end
   end
 end