commit 2c3010750f4823884224cff5d83ef2cba87b05a6
parent b566bf6d0369474380338cb738d06d40066c1565
Author: Gaute Hope <eg@gaute.vetsj.com>
Date: Fri, 25 Sep 2015 11:18:41 +0200
Revert "Move all color files + fix typos"
This reverts commit 36b805d0ac4246562c00c38ae1c21ab65e774e17.
Diffstat:
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/bin/sup b/bin/sup
@@ -24,14 +24,14 @@ require 'trollop'
# In the future, this is to be removed, probably if you never remember
# sup being in the ~/.sup folder
def xdg_config_dir
- return ENV['SUP_BASE'] if ENV['SUP_BASE']
+ ENV['SUP_BASE'] if ENV['SUP_BASE']
dir = ENV['XDG_CONFIG_HOME'] || File.join(ENV['HOME'], '.config/')
File.join(dir, 'sup')
end
def xdg_data_dir
- return ENV['SUP_BASE'] if ENV['SUP_BASE']
+ ENV['SUP_BASE'] if ENV['SUP_BASE']
dir = ENV['XDG_DATA_HOME'] || File.join(ENV['HOME'], '.local/share/')
File.join(dir, 'sup')
@@ -42,12 +42,11 @@ if Dir.exist?((old_sup_dir = File.join(ENV["HOME"], ".sup"))) && !ENV['SUP_BASE'
FileUtils.mkdir_p xdg_data_dir
FileUtils.cd old_sup_dir do
- config_files = Dir.entries(old_sup_dir).select do |file|
- file =~ /(config|sources|colors)\.?\w*\.yaml(.bak)?/i
+ files = Dir.entries old_sup_dir
+ %w(config.yaml sources.yaml colors.yaml).each do |file|
+ FileUtils.mv file, xdg_config_dir if files.include? file
end
- config_files.each { |file| FileUtils.mv file, xdg_config_dir }
-
FileUtils.mv Dir.glob("*"), xdg_data_dir
end
FileUtils.remove_dir old_sup_dir
diff --git a/lib/sup.rb b/lib/sup.rb
@@ -50,12 +50,12 @@ module Redwood
DATA_DIR = ENV['SUP_BASE']
else
CONFIG_DIR = if ENV['XDG_CONFIG_HOME']
- File.join(ENV['XDG_CONFIG_HOME'], "sup")
+ File.join(ENV['XDG_CONFIG_DIR'], "sup")
else
File.join(ENV['HOME'], ".config/sup")
end
DATA_DIR = if ENV['XDG_DATA_HOME']
- File.join(ENV['XDG_DATA_HOME'], "sup")
+ File.join(['XDG_DATA_HOME'], "sup")
else
File.join(ENV['HOME'], ".local/share/sup")
end