From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Apr 2020 13:42:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2599'
X-Git-Tag: live~2312
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/62d35fb9724e65c7a5d3e57cff1d341226730e10?hp=c51786d10bc6dda488964f468a6a3071dd6912a8

Merge remote-tracking branch 'upstream/pull/2599'
---

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 959d82e1c..49e4a041b 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -215,25 +215,23 @@ class Trace < ApplicationRecord
     tarred = filetype =~ /tar archive/
 
     if gzipped || bzipped || zipped || tarred
-      tmpfile = Tempfile.new("trace.#{id}")
+      file = Tempfile.new("trace.#{id}")
 
       if tarred && gzipped
-        system("tar -zxOf #{trace_name} > #{tmpfile.path}")
+        system("tar -zxOf #{trace_name} > #{file.path}")
       elsif tarred && bzipped
-        system("tar -jxOf #{trace_name} > #{tmpfile.path}")
+        system("tar -jxOf #{trace_name} > #{file.path}")
       elsif tarred
-        system("tar -xOf #{trace_name} > #{tmpfile.path}")
+        system("tar -xOf #{trace_name} > #{file.path}")
       elsif gzipped
-        system("gunzip -c #{trace_name} > #{tmpfile.path}")
+        system("gunzip -c #{trace_name} > #{file.path}")
       elsif bzipped
-        system("bunzip2 -c #{trace_name} > #{tmpfile.path}")
+        system("bunzip2 -c #{trace_name} > #{file.path}")
       elsif zipped
-        system("unzip -p #{trace_name} -x '__MACOSX/*' > #{tmpfile.path} 2> /dev/null")
+        system("unzip -p #{trace_name} -x '__MACOSX/*' > #{file.path} 2> /dev/null")
       end
 
-      tmpfile.unlink
-
-      file = tmpfile.file
+      file.unlink
     else
       file = File.open(trace_name)
     end
diff --git a/config/initializers/tempfile.rb b/config/initializers/tempfile.rb
deleted file mode 100644
index 43b5a5443..000000000
--- a/config/initializers/tempfile.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# Hack TempFile to let us get at the underlying File object as ruby
-# does a half assed job of making TempFile act as a File
-class Tempfile
-  def file
-    @tmpfile
-  end
-end