josh/svi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move ruby share files under share/svi/lib

Browse Source
This commit is contained in:
Josh Holtrop 2018-02-06 21:35:19 -05:00
parent ea585d0f5b
commit c84fbddaca
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/svi/bootstrap.rb → share/svi/lib/bootstrap.rb
View File

@ -1,5 +1,5 @@
begin begin
load File.join(File.dirname(__FILE__), "svi.rb") load "#{$SHARE_DIR}/lib/svi.rb"
rescue Interrupt => e rescue Interrupt => e
rescue Exception => e rescue Exception => e
$stderr.puts "#{e.class}: #{e}" $stderr.puts "#{e.class}: #{e}"

0
share/svi/svi.rb → share/svi/lib/svi.rb
View File

6
src/main.cc
View File

@ -6,8 +6,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#define SHARE_BOOTSTRAP "/share/svi/bootstrap.rb"
VALUE svi_ruby_protect_eval_string_rescue(VALUE exception, VALUE exception_object) VALUE svi_ruby_protect_eval_string_rescue(VALUE exception, VALUE exception_object)
{ {
*(bool *)exception = true; *(bool *)exception = true;
@ -85,7 +83,7 @@ const char * read_bootstrap_file()
if (index != std::string::npos) if (index != std::string::npos)
{ {
share_dir = std::string(exe_path, 0u, index) + "/share/svi"; share_dir = std::string(exe_path, 0u, index) + "/share/svi";
char * bootstrap = read_file((share_dir + "/bootstrap.rb").c_str()); char * bootstrap = read_file((share_dir + "/lib/bootstrap.rb").c_str());
if (bootstrap != nullptr) if (bootstrap != nullptr)
{ {
return bootstrap; return bootstrap;
@ -93,7 +91,7 @@ const char * read_bootstrap_file()
} }
} }
share_dir = SHARE_DIR; share_dir = SHARE_DIR;
return read_file(SHARE_DIR "/bootstrap.rb"); return read_file(SHARE_DIR "/lib/bootstrap.rb");
} }
int main(int argc, char * argv[]) int main(int argc, char * argv[])