Merge branch 'master' of github.com:relevance/etc

scripts/pair

@@ -21,6 +21,7 @@ AUTHORS = {
   "ca" => "Craig Andera",
   "cd" => "Clinton Dreisbach",
   "cr" => "Chris Redinger",
+  "dm" => "Daemian Mack",
   "gh" => "Gabriel Horner",
   "jd" => "Jon Distad",
   "jg" => "Justin Gehtland",
@@ -30,6 +31,7 @@ AUTHORS = {
   "jp" => "Jared Pace",
   "jr" => "Jason Rudolph",
   "ka" => "Kevin Altman",
+  "kn" => "Kevin Neaton",
   "ke" => "Kelly Ehret",
   "ld" => "Lake Denman",
   "lk" => "Larry Karnowski",
@@ -43,7 +45,9 @@ AUTHORS = {
   "sh" => "Stuart Halloway",
   "ss" => "Stuart Sierra",
   "su" => "Sam Umbach",
+  "tb" => "Timothy Baldridge",
   "te" => "Tim Ewald",
+  "yh" => "Yoko Harada",
 }
 
 ## End of configuration

scripts/upgrade_nx.rb

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'open-uri'
-body = open("http://www.nomachine.com/preview/download-package.php?Prod_Id=1").read
-package_uri = body[%r{http:.*?amd64\.deb}] or abort "Uri for debian package not found!"
+body = open("http://www.nomachine.com/preview/download-package.php?Prod_Id=3").read
+package_uri = body[%r{http:.*?nxserver[^/]+\.deb}] or abort "Uri for debian package not found!"
+# since we don't get the amd64 uri directly
+package_uri.sub!('i386', 'amd64')
 package_basename = package_uri[/nxserver.*\.deb$/] or abort "No basename for debian package found!"
 puts "Installing latest package: #{package_uri}\n\n"