diff options
author | Clement Farabet <clement.farabet@gmail.com> | 2013-10-12 05:52:51 +0400 |
---|---|---|
committer | Clement Farabet <clement.farabet@gmail.com> | 2013-10-12 05:52:51 +0400 |
commit | 8f1eafffa5cf3e00c109ee6af7705e5826f29177 (patch) | |
tree | e8518483e293e5594ee7708485e076eab900f750 /init.lua | |
parent | 9c65733ec86ec386ebda583886b620607eb4db6c (diff) |
Reverted require.
Diffstat (limited to 'init.lua')
-rw-r--r-- | init.lua | 45 |
1 files changed, 4 insertions, 41 deletions
@@ -49,7 +49,6 @@ local glob = _G local torch = torch local pairs = pairs local ipairs = ipairs -local require = require local table = table local string = string local pcall = pcall @@ -59,8 +58,8 @@ local _protect_ = _protect_ module 'xlua' -- extra files -require 'xlua.OptionParser' -require 'xlua.Profiler' +_G.require 'xlua.OptionParser' +_G.require 'xlua.Profiler' ---------------------------------------------------------------------- -- better print function @@ -351,44 +350,8 @@ function require(package,luarocks,server) local load = function() loaded = glob.require(package) end local ok,err = glob.pcall(load) if not ok then - local lrocks = glob.sys.concat(glob.sys.prefix, 'bin', 'luarocks') - local search = ' search ' - local install = ' install ' - if luarocks then - local search = glob.sys.execute(lrocks .. search .. package - .. ((server and (' --from=' .. server)) or '')) - if search:find('error') or search:find('Error') then - print(search) - print('please verify your internet connectivity') - elseif search:find(package) then - print('<' .. package .. '> not found locally, but available form luarocks:') - print(search) - print('do you want to install <'.. package ..'> ? [Y/n]') - local answer = glob.io.stdin:read '*l' - answer = ((answer == '' or answer == 'Y') and 'y') or 'n' - if answer == 'y' then - local cmd = lrocks .. install .. package - .. ((server and (' --from=' .. server)) or '') - print(cmd) - print('building/installing: be patient :-)') - glob.os.execute(cmd) - if package == 'torch' then - print('package <torch> installed, please restart Lua!') - else - loaded = glob.require(package) - print('package installed and loaded!') - end - else - print('package could not be loaded') - end - else - print(search) - print('package not found') - end - else - print(err) - print('warning: <' .. package .. '> could not be loaded (is it installed?)') - end + print(err) + print('warning: <' .. package .. '> could not be loaded (is it installed?)') return false end return loaded |