Skip to content

Commit

Permalink
renamed tools/pik.exe to pik_runner.exe to minimize confusion/conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
vertiginous committed Oct 22, 2009
1 parent dd59d32 commit b38f547
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Rakefile
Expand Up @@ -4,13 +4,13 @@ require 'rubygems'

file 'tools/pik/pik.exy' do
Dir.chdir 'tools/pik' do
sh('ruby -rexerb/mkexy pik')
sh('ruby -rexerb/mkexy pik_runner')
end
end

file 'tools/pik/pik.exe', :needs => 'tools/pik/pik.exy' do
Dir.chdir 'tools/pik' do
sh('ruby -S exerb pik.exy')
sh('ruby -S exerb pik_runner.exy')
end
end

Expand Down
14 changes: 9 additions & 5 deletions bin/pik_install
Expand Up @@ -12,12 +12,16 @@ tools_dir = File.join(File.dirname(__FILE__), '..', 'tools')
if File.directory?(install_dir)
puts "Installing to #{install_dir}\n\n"
cp File.join(tools_dir, 'pik.bat'), install_dir ,
:verbose => true
:verbose => true
mkdir_p File.join(install_dir, 'pik'), :verbose => true
cp File.join(tools_dir, 'pik', 'pik.exe'),
File.join(install_dir, 'pik') ,
:verbose => true
puts "\npik is installed"
cp File.join(tools_dir, 'pik', 'pik_runner.exe'),
File.join(install_dir, 'pik') ,
:verbose => true

old_exe = File.join(install_dir, 'pik', 'pik.exe')
rm(old_exe, :verbose => true) if File.exist?(old_exe)

puts "\npik is installed"
else
puts "#{install_dir} is not a directory. pik was not installed."
end
2 changes: 1 addition & 1 deletion lib/pik/commands/help_command.rb
Expand Up @@ -24,7 +24,7 @@ def execute
end

def command_options
options.program_name = "#{File.basename($0)} command"
options.program_name = "#{PIK_BATCH.basename('.*')} command"
sep = <<SEP
To get help with a command
Expand Down
2 changes: 1 addition & 1 deletion tools/pik.bat
@@ -1,2 +1,2 @@
@ECHO OFF
"%~dpn0\%~n0.exe" "%~dpf0" %*
"%~dpn0\%~n0_runner.exe" "%~dpf0" %*
File renamed without changes.

0 comments on commit b38f547

Please sign in to comment.