bin/push_package in push_package-0.5.0 vs bin/push_package in push_package-0.5.1

- old
+ new

@@ -2,11 +2,11 @@ require 'json' require 'optparse' require 'push_package' -# $> push_package --website-json=./website.json --iconset=~/project/iconset --certificate=./Certificate.p12 --output-dir=./ +# $> push_package --website-json=./website.json --iconset-path=/path/to/project/iconset --certificate=./Certificate.p12 --output-dir=./ options = {} options_parser = OptionParser.new do |opts| opts.banner = 'Usage: push_package [options]' opts.on('-w', '--website-json required', 'The path to the file containing the website.json') do |opt| @@ -36,16 +36,22 @@ options_parser.parse! # check the required options [:website_json_path, :certificate_path].each do |opt| - unless File.file?(options[opt].to_s) + path = File.expand_path(options[opt].to_s) + unless File.file?(path) + puts "#{path}: No such file" + puts puts options_parser.help exit 1 end end -unless File.directory?(options[:iconset_path].to_s) +iconset_path = File.expand_path(options[:iconset_path].to_s) +unless File.directory?(iconset_path) + puts "#{iconset_path}: No such directory" + puts puts options_parser.help exit 1 end options[:output_directory] = `pwd`.strip unless options[:output_directory]