summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-18 21:50:15 +0200
committerhut <hut@lavabit.com>2010-04-18 21:50:15 +0200
commit1b43b21dc038ea4146aa138e0dc21f49e954f851 (patch)
treea7dbe9703f09421283225e3871d94e18b3d8bc03
parente0bc0ff6017ccf4fb55ed400266161d4c0131435 (diff)
downloadranger-1b43b21dc038ea4146aa138e0dc21f49e954f851.tar.gz
shared.settings: Bugfix, read the options properly
-rw-r--r--ranger/shared/settings.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py
index 16167fe4..910f20bf 100644
--- a/ranger/shared/settings.py
+++ b/ranger/shared/settings.py
@@ -13,6 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import sys
 import ranger
 from ranger.ext.signal_dispatcher import SignalDispatcher
 from ranger.ext.openstruct import OpenStruct
@@ -140,12 +141,14 @@ class SettingsAware(object):
 
 		if not ranger.arg.clean:
 			# overwrite single default options with custom options
+			sys.path[0:0] = [ranger.arg.confdir]
 			try:
 				import options as my_options
 			except ImportError:
 				pass
 			else:
 				settings._setting_sources.append(my_options)
+			del sys.path[0]
 
 		from ranger.defaults import options as default_options
 		settings._setting_sources.append(default_options)
^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45

          
 
                                   
 

                                                                   
                                                                            

 






                                                                       


                                                                
















                                                                           







                                                                        
Installing
==========

You don't need to install anything.

You can run ranger by simply starting the executable file ranger.py
in the top directory of this package.
Use the --clean option and it will leave no trace whatsoever on your system.


If you insist on conventionally install it, use the package manager
of your operating system.  If there is no package or it is out of date,
you can also follow these instructions:


Step by step
============

(This is all done automagically if you type `sudo make install',
though you might want to read the Makefile first)

0. Make sure you have a recent version of python, including the
   curses module, which is the case if this shell command prints no errors:
   python -c 'import curses'


1. Copy the file "ranger.py" into any of the directories in the PATH
   environment variable, for example to "/usr/bin/ranger"


2. Copy the directory "ranger" into one of the python module search
   paths, for example to "/usr/lib/python2.6/site-packages/ranger".

   Ensure that the path is listed by the command:
   python -c 'import sys; print("\n".join(sys.path))'


Uninstalling
============

Use your package manager to uninstall ranger.  If you manually installed
it, revert the steps described above.

Ranger can also create a configuration directory at ~/.ranger which
you might want to remove as well.