[or-cvs] r23817: {arm} Including sample configuration file in "/usr/share/doc/arm/a (arm/trunk)

[Damian Johnson <atagar1@xxxxxxxxx>]

Author: atagar
Date: 2010-11-17 07:09:55 +0000 (Wed, 17 Nov 2010)
New Revision: 23817

Modified:
   arm/trunk/arm.1
   arm/trunk/setup.py
Log:
Including sample configuration file in "/usr/share/doc/arm/armrc.sample" on installation. For debian the path is tor-arm instead.



Modified: arm/trunk/arm.1
===================================================================
--- arm/trunk/arm.1	2010-11-17 06:40:14 UTC (rev 23816)
+++ arm/trunk/arm.1	2010-11-17 07:09:55 UTC (rev 23817)
@@ -61,6 +61,10 @@
 \fB~/.armrc\fR
 Your personal arm configuration file
 
+.TP
+\fB/usr/share/doc/arm/armrc.sample\fR
+Sample armrc configuration file that documents all options
+
 .SH AUTHOR
 Written by Damian Johnson (atagar1@xxxxxxxxx)
 

Modified: arm/trunk/setup.py
===================================================================
--- arm/trunk/setup.py	2010-11-17 06:40:14 UTC (rev 23816)
+++ arm/trunk/setup.py	2010-11-17 07:09:55 UTC (rev 23817)
@@ -23,6 +23,12 @@
   print "Unable to compress man page: %s" % exc
   manFilename = "arm.1"
 
+# if this is placing resources for debian then the sample armrc should go in
+# tor-arm instead of arm
+docPath = "/usr/share/doc/"
+if "--install-layout=deb" in sys.argv: docPath += "tor-arm"
+else: docPath += "arm"
+
 setup(name='arm',
       version=VERSION,
       description='Terminal tor status monitor',
@@ -34,6 +40,7 @@
       package_dir={'arm': 'src'},
       data_files=[("/usr/bin", ["arm"]),
                   ("/usr/share/man/man1", [manFilename]),
+                  (docPath, ["armrc.sample"]),
                   ("/usr/share/pyshared/arm", ["src/settings.cfg"])],
      )