Include OS version and build number in panic backup folder name

As suggested by @mralexgray
binaryage · May 24, 2015 · ecd7c14 · ecd7c14
1 parent 092bb8c
commit ecd7c14
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/ctl/cmd/install_wrapper.rb b/ctl/cmd/install_wrapper.rb
@@ -29,7 +29,8 @@ def cmd_install_wrapper(options)
 
     # make timestamped panic backup
     timestamp = Time.now.strftime("%Y%m%d%H%M%S")
-    panic_backup_folder_with_timestamp = "#{DS_LIB_PANIC_BACKUP_FOLDER}_#{timestamp}"
+    os_marker = os_version_marker()
+    panic_backup_folder_with_timestamp = "#{DS_LIB_PANIC_BACKUP_FOLDER}_#{os_marker}_#{timestamp}"
     unless File.exists? panic_backup_folder_with_timestamp then
         sys("sudo cp -a \"#{DS_LIB_FOLDER}\" \"#{panic_backup_folder_with_timestamp}\"")
     end

diff --git a/ctl/lib/helpers.rb b/ctl/lib/helpers.rb
@@ -110,4 +110,19 @@ def prior_yosemite?
 def desktopservicespriv_wrapper?(file)
   # this is simple and stupid test: our wrapper library is small, under 100kb
   File.size(file) <= 100*1024
+end
+
+def safe_string_to_filename(s)
+  s.gsub(/[^a-zA-Z0-9]/, "_").gsub(/_+/, "_")
+end
+
+def os_version_marker()
+  begin
+    vers = `sw_vers`.split("\n")
+    os_version = vers[1].match(/:\s*(.*)/)[1]
+    build_version = vers[2].match(/:\s*(.*)/)[1]
+    safe_string_to_filename("#{os_version}_#{build_version}")
+  rescue
+    ""
+  end
 end