diff options
author | hut <hut@lavabit.com> | 2009-06-12 01:07:49 +0200 |
---|---|---|
committer | hut <hut@lavabit.com> | 2009-06-12 01:07:49 +0200 |
commit | 7fe5169680d000adb38ebcf20570f53a119bafc6 (patch) | |
tree | c390e0821f25e7a258da334ac41178ad2524874c | |
parent | 00ec77361efe9bf14042080bd6a16a4efaec831c (diff) | |
download | ranger-7fe5169680d000adb38ebcf20570f53a119bafc6.tar.gz |
moved screensaver, cleanups
-rw-r--r-- | data/screensaver/clock.rb (renamed from code/screensaver/clock.rb) | 0 | ||||
-rwxr-xr-x | ranger.rb | 19 |
2 files changed, 5 insertions, 14 deletions
diff --git a/code/screensaver/clock.rb b/data/screensaver/clock.rb index 6289c809..6289c809 100644 --- a/code/screensaver/clock.rb +++ b/data/screensaver/clock.rb diff --git a/ranger.rb b/ranger.rb index b9dd8e7d..5b074317 100755 --- a/ranger.rb +++ b/ranger.rb @@ -10,14 +10,8 @@ LOG_LEVEL = 3 #LOG_LEVEL = 0 require 'pathname' - -def fj( *args ) File.join( *args ) end - $: << MYDIR = File.dirname(Pathname.new(__FILE__).realpath) - -#SCREENSAVER = fj MYDIR, 'code', 'screensaver', 'clock.rb' - EVIL = false PID = Process.pid @@ -52,6 +46,8 @@ for file in Dir["#{MYDIR}/code/**/*.rb"] require file end +require 'data/screensaver/clock.rb' + unless ARGV.empty? or File.directory?(pwd) exec(Fm.getfilehandler_frompath(pwd)) end @@ -61,14 +57,9 @@ include Debug ERROR_STREAM = File.open('/tmp/errorlog', 'a') -#def log(obj) -# $stdout = ERROR_STREAM -# pp caller -# pp obj -# $stdout.flush -# $stdout = STDOUT -# obj -#end +Signal.trap(Scheduler::UPDATE_SIGNAL) do + Fm.refresh +end begin Fm.initialize( pwd ) |