summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2019-12-12 17:13:26 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2019-12-12 22:27:33 -0500
commit21e1d186c5a2a672dd495fa2f023985a9b939504 (patch)
treef365993305072673eb9d9137c016b2c77bc4628d
parent256298666d383a8ab4488788f9ee5f4f5391ba1c (diff)
whitespace
-rw-r--r--bin/common.rb.in46
1 files changed, 23 insertions, 23 deletions
diff --git a/bin/common.rb.in b/bin/common.rb.in
index 508aef1..c9f4203 100644
--- a/bin/common.rb.in
+++ b/bin/common.rb.in
@@ -18,42 +18,42 @@ require 'set'
require 'yaml'
def cfg
- if @cfg.nil?
+ if @cfg.nil?
# allow in-tree usage and tests
this_dir = File.dirname(__FILE__)
is_in_build_tree = File::file? "#{this_dir}/common.rb.in"
cfg_file = (is_in_build_tree) ? "#{this_dir}/../parabola-hackers.yml" : '@conf_file@'
@cfg = YAML::load(open(cfg_file))
- if ENV['PARABOLA_HACKERS_YAMLDIR']
- @cfg["yamldir"] = ENV['PARABOLA_HACKERS_YAMLDIR']
- end
- end
- return @cfg
+ if ENV['PARABOLA_HACKERS_YAMLDIR']
+ @cfg["yamldir"] = ENV['PARABOLA_HACKERS_YAMLDIR']
+ end
+ end
+ return @cfg
end
def add_group(group_set, groupname)
- return if group_set.include?(groupname)
- group_set.add(groupname)
- (cfg["groupgroups"][groupname] || []).each do |subgroupname|
- add_group(group_set, subgroupname)
- end
+ return if group_set.include?(groupname)
+ group_set.add(groupname)
+ (cfg["groupgroups"][groupname] || []).each do |subgroupname|
+ add_group(group_set, subgroupname)
+ end
end
def load_user_yaml(filename)
- user = YAML::load(open(filename))
- groups = Set.new
- (user["groups"] || []).each{|groupname| add_group(groups, groupname)}
- user["groups"] = groups.sort
- return user
+ user = YAML::load(open(filename))
+ groups = Set.new
+ (user["groups"] || []).each{|groupname| add_group(groups, groupname)}
+ user["groups"] = groups.sort
+ return user
end
def load_all_users
- users = {}
- Dir.glob("#{cfg["yamldir"]}/*.yml").map{|filename|
- uid = File.basename(filename).sub(/^([0-9]*)\.yml$/, "\\1").to_i
- user = load_user_yaml(filename)
- users[uid] = user
- }
- return users
+ users = {}
+ Dir.glob("#{cfg["yamldir"]}/*.yml").map{|filename|
+ uid = File.basename(filename).sub(/^([0-9]*)\.yml$/, "\\1").to_i
+ user = load_user_yaml(filename)
+ users[uid] = user
+ }
+ return users
end