From e8c52e53459ae43f5b19dc57cb41fdf1d73b5593 Mon Sep 17 00:00:00 2001
From: Seblu <sebastien.luttringer@smartjog.com>
Date: Mon, 3 Jan 2011 16:57:45 +0100
Subject: [PATCH] Implement http://standards.freedesktop.org/basedir-spec/0.6/
---
bin/cc-cli | 22 ++++++++++++----------
debian/control | 2 +-
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/bin/cc-cli b/bin/cc-cli
index 995bad1..95fb6d7 100755
--- a/bin/cc-cli
+++ b/bin/cc-cli
@@ -12,30 +12,32 @@ import ConfigParser
import pprint
import re
import warnings
+from xdg import BaseDirectory
import cccli
from cccli.cli import Cli
from cccli.printer import Printer
from cccli.exception import *
+canonical_name="cc-cli"
settings = {
"port": "1984",
"timeout": "5",
- "hsize": "100"
+ "hsize": "100",
+ "config": "%s/cli"%BaseDirectory.save_config_path(canonical_name),
+ "alias": "%s/alias"%BaseDirectory.save_config_path(canonical_name),
+ "history": "%s/history"%BaseDirectory.save_data_path(canonical_name),
}
printer = Printer(False)
try:
- # parse rc file
- if "HOME" in os.environ:
- settings["alias"] = "%s/.cc-cli.conf"%os.environ["HOME"]
- settings["history"] = "%s/.cc-cli.history"%os.environ["HOME"]
- if os.access("%s/.cc-cli.conf"%os.environ["HOME"], os.R_OK):
- fparser = ConfigParser.SafeConfigParser()
- fparser.read("%s/.cc-cli.conf"%os.environ["HOME"])
- if fparser.has_section("cli"):
- settings.update(fparser.items("cli"))
+ # parse config file
+ if os.access(settings["config"], os.R_OK):
+ fparser = ConfigParser.SafeConfigParser()
+ fparser.read(settings["config"])
+ if fparser.has_section("cli"):
+ settings.update(fparser.items("cli"))
# parse env
if "CC_SERVER" in os.environ:
diff --git a/debian/control b/debian/control
index a20e676..375872b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.8.0
Package: cc-cli
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python (<< 3), python-sjrpc (>= 7)
+Depends: ${misc:Depends}, ${python:Depends}, python (<< 3), python-sjrpc (>= 7), python-xdg
XB-Python-Version: ${python:Versions}
Description: CloudControl CLI
This package provides the Command Line Interface to CloudControl.
--
GitLab