bin/pgxn-utils in pgxn_utils-0.1.3 vs bin/pgxn-utils in pgxn_utils-0.1.4

@@ -1,10 +1,22 @@
 #!/usr/bin/env ruby
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 require 'pgxn_utils'
 
-task = __FILE__.gsub(/pgxn-utils-/,'').gsub(/-/,'_') if File.basename(__FILE__) =~ /^pgxn-utils-/
-command_args = [ task ] + ARGV if task
+command_args = []
 
-puts "PGXN Utils version: #{PgxnUtils::VERSION}" if ARGV.empty?
+if ARGV.include? "--help"
+	command_args = [ 'help' ]
+end
+
+task = File.basename(__FILE__).gsub(/pgxn-/,'') if File.basename(__FILE__) =~ /^pgxn-(skeleton|bundle|change|release)/
+
+if task
+	command_args = command_args + [ task ]
+	$0 = $0.gsub(/pgxn-.*/,'/pgxn')
+end
+
+command_args = command_args + ARGV
+
+puts "PGXN Utils version: #{PgxnUtils::VERSION}" if command_args.include?('help')
 PgxnUtils::CLI.start( command_args || ARGV )