fix: any

[pettanr/pettanr.git] / bin / preup.rb

diff --git a/bin/preup.rb b/bin/preup.rb
index c902cb4..3bc80a6 100644 (file)
--- a/bin/preup.rb
+++ b/bin/preup.rb
@@ -4,16 +4,16 @@ require 'fileutils'
 require 'json'\r
 \r
 if ARGV.size < 1\r
-  puts "preup.rb dirname {license.json}"\r
+  puts "preup.rb default.attr"\r
   exit\r
 end\r
 \r
-dirname = File.expand_path ARGV[0]\r
-ls = if ARGV.size > 1 and File.exist?(ARGV[1]) \r
-  ARGV[1]\r
-else\r
-  nil\r
-end\r
+dirname = File.expand_path(File.dirname(ARGV[0]))\r
+default_attr_file = ARGV[0]\r
+\r
+puts dirname\r
+puts default_attr_file\r
+default_attr = JSON.parse(File.open(default_attr_file, 'r').read)\r
 \r
 Dir.glob(dirname + '/*') do |fn|\r
   ext = File.extname(fn).downcase\r
@@ -21,30 +21,9 @@ Dir.glob(dirname + '/*') do |fn|
   case ext\r
   when '.png', '.gif', '.jpeg'\r
     puts fn\r
-    d = File.dirname(fn) + '/' + bn\r
-    Dir.mkdir(d) unless File.exist?(d)\r
-    FileUtils.cp fn, d + '/' + File.basename(fn)\r
-    if ls\r
-      puts 'with license:' + ls\r
-      lsfn = d + '/' + File.basename(ls)\r
-      attrfn = d + '/attributes.json'\r
-      if File.exist?(attrfn) \r
-        puts 'get attributes.json'\r
-        attr = nil\r
-        File.open(attrfn, 'r') do |f|\r
-          attr = JSON.parse(f.read)\r
-        end\r
-        json = JSON.parse(open(ls).read)\r
-        if json['attributes'] and attr\r
-          json['attributes'] = attr\r
-        end\r
-        File.open(lsfn, 'w') do |f|\r
-          f.write JSON.pretty_generate(json)\r
-        end\r
-      else\r
-        FileUtils.cp ls, lsfn\r
-      end\r
-    end\r
+    custom_attr_file = File.dirname(fn) + '/' + bn + '.json'\r
+    FileUtils.cp(default_attr_file, custom_attr_file) unless File.exist?(custom_attr_file) \r
+    custom_attr = JSON.parse(File.open(custom_attr_file, 'r').read)\r
   end\r
 end\r
 \r