Land #8883, Fixup R payload platform and metadata

lib/msf/core/module/platform.rb

@@ -352,6 +352,14 @@ class Msf::Module::Platform
     Alias = "java"
   end
 
+  #
+  # R
+  #
+  class R < Msf::Module::Platform
+    Rank = 100
+    Alias = "r"
+  end
+
   #
   # Ruby
   #

modules/payloads/singles/cmd/unix/bind_r.rb

@@ -27,7 +27,7 @@ module MetasploitModule
       'Handler'     => Msf::Handler::BindTcp,
       'Session'     => Msf::Sessions::CommandShell,
       'PayloadType' => 'cmd',
-      'RequiredCmd' => 'ruby',
+      'RequiredCmd' => 'R',
       'Payload'     => { 'Offsets' => {}, 'Payload' => '' }
     ))
   end

modules/payloads/singles/cmd/unix/reverse_r.rb

@@ -22,11 +22,12 @@ module MetasploitModule
       'Description' => 'Connect back and create a command shell via R',
       'Author'      => [ 'RageLtMan' ],
       'License'     => MSF_LICENSE,
-      'Platform'    => 'r',
-      'Arch'        => ARCH_R,
+      'Platform'    => 'unix',
+      'Arch'        => ARCH_CMD,
       'Handler'     => Msf::Handler::ReverseTcp,
       'Session'     => Msf::Sessions::CommandShell,
-      'PayloadType' => 'r',
+      'PayloadType' => 'cmd',
+      'RequiredCmd' => 'R',
       'Payload'     => { 'Offsets' => {}, 'Payload' => '' }
     ))
   end