commit b566bf6d0369474380338cb738d06d40066c1565
parent 5e254737915f90ffa5b275af31df5bf92de6af1f
Author: Gaute Hope <eg@gaute.vetsj.com>
Date: Fri, 25 Sep 2015 11:18:17 +0200
revert fa6ce11
Diffstat:
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/bin/sup b/bin/sup
@@ -38,12 +38,11 @@ def xdg_data_dir
end
if Dir.exist?((old_sup_dir = File.join(ENV["HOME"], ".sup"))) && !ENV['SUP_BASE']
-
FileUtils.mkdir_p xdg_config_dir
FileUtils.mkdir_p xdg_data_dir
FileUtils.cd old_sup_dir do
- config_files = Dir.entries(old_sup_dir).select do |file|
+ config_files = Dir.entries(old_sup_dir).select do |file|
file =~ /(config|sources|colors)\.?\w*\.yaml(.bak)?/i
end
@@ -52,13 +51,7 @@ if Dir.exist?((old_sup_dir = File.join(ENV["HOME"], ".sup"))) && !ENV['SUP_BASE'
FileUtils.mv Dir.glob("*"), xdg_data_dir
end
FileUtils.remove_dir old_sup_dir
-
- if axe_yes("sup has moved configuration files, xapian index and all contents of ~/.sup to the default XDG directories, do you need to make any manual changes?", "y")
- exit
- end
-
end
-
require 'sup'
if ENV['SUP_PROFILE']