summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-08-28 21:27:43 +0200
committerhut <hut@lavabit.com>2010-08-28 21:27:43 +0200
commit0df1d653deb7a9a8ca30f012475891e339b4449f (patch)
treecc56d9916bb66029280c8fd2a1d96ca976202aca
parentbd33933dd1cb708a5e708b361c1842190a1c9e4b (diff)
downloadranger-0df1d653deb7a9a8ca30f012475891e339b4449f.tar.gz
Changed version number to 1.2 (testing) to adhere with versioning scheme
-rw-r--r--HACKING2
-rw-r--r--README4
-rw-r--r--doc/ranger.12
-rw-r--r--ranger/__init__.py2
-rw-r--r--ranger/__main__.py9
5 files changed, 13 insertions, 6 deletions
diff --git a/HACKING b/HACKING
index 0424b047..1794c8e5 100644
--- a/HACKING
+++ b/HACKING
@@ -92,4 +92,4 @@ X.Y.Z, where:
 
 * X: Major version, milestone
 * Y: Minor version, odd number => stable version
-* Z: Revision
+* Z: Revision, may be omitted if zero
diff --git a/README b/README
index babcfbbb..912b8718 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-Ranger v.1.1.2
-==============
+Ranger v.1.2
+============
 
 Ranger is a free console file manager that gives you greater flexibility
 and a good overview of your files without having to leave your *nix console.
diff --git a/doc/ranger.1 b/doc/ranger.1
index fab42496..10f78d47 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -1,4 +1,4 @@
-.TH RANGER 1 ranger-1.1.2
+.TH RANGER 1 ranger-1.2
 .SH NAME
 ranger - visual file manager
 .\"-----------------------------------------
diff --git a/ranger/__init__.py b/ranger/__init__.py
index 57e0e5a2..282fd2b1 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -20,7 +20,7 @@ import sys
 from ranger.ext.openstruct import OpenStruct
 
 __license__ = 'GPL3'
-__version__ = '1.1.2'
+__version__ = '1.2'
 __credits__ = 'Roman Zimbelmann'
 __author__ = 'Roman Zimbelmann'
 __maintainer__ = 'Roman Zimbelmann'
diff --git a/ranger/__main__.py b/ranger/__main__.py
index 28284ef5..5a8411d6 100644
--- a/ranger/__main__.py
+++ b/ranger/__main__.py
@@ -30,7 +30,14 @@ def parse_arguments():
 	from optparse import OptionParser, SUPPRESS_HELP
 	from ranger import __version__, USAGE, DEFAULT_CONFDIR
 	from ranger.ext.openstruct import OpenStruct
-	parser = OptionParser(usage=USAGE, version='ranger ' + __version__)
+
+	minor_version = __version__[2:]  # assumes major version number is <10
+	if '.' in minor_version:
+		minor_version = minor_version[:minor_version.find('.')]
+	version_tag = ' (stable)' if int(minor_version) % 2 == 1 else ' (testing)'
+	version_string = 'ranger ' + __version__ + version_tag
+
+	parser = OptionParser(usage=USAGE, version=version_string)
 
 	parser.add_option('-d', '--debug', action='store_true',
 			help="activate debug mode")
febdb'>33352536 ^
9d27e966 ^
ecfbbfb5 ^
0c57224c ^
ecfbbfb5 ^
9d27e966 ^
33352536 ^
9d27e966 ^
33352536 ^
9d27e966 ^
33352536 ^
9d27e966 ^
ecfbbfb5 ^
b0f89e4f ^
ecfbbfb5 ^

b0f89e4f ^
ee9a9237 ^
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
                                                                       
 
         
                                                                   
                             
 
       




                                           
       
 
      
                   
                  
                       
                                          
                       
                      
                       
           
                            
 
                     
                   
                       
                                        
                       
                      
                       
           
                             
 

                            
 
                            
# Read a character from stdin, save it to a global, write it to stdout.
#
# To run:
#   $ ./subx translate init.linux examples/ex4.subx -o examples/ex4
#   $ ./subx run examples/ex4

== data

# the global variable we save to
X:
    0/imm32  # space for read() to write to

== code

Entry:
# read(stdin, X, 1)
# . fd = 0 (stdin)
bb/copy-to-ebx  0/imm32
# . data = X (location to write result to)
b9/copy-to-ecx  X/imm32
# . size = 1 character
ba/copy-to-edx  1/imm32
# . syscall
e8/call  syscall_read/disp32

# write(stdout, X, 1)
# . fd = 1 (stdout)
bb/copy-to-ebx  1/imm32
# . initialize X (location to read from)
b9/copy-to-ecx  X/imm32
# . size = 1 character
ba/copy-to-edx  1/imm32
# . syscall
e8/call  syscall_write/disp32

# exit(ebx)
e8/call  syscall_exit/disp32

# . . vim:nowrap:textwidth=0