Commit e8c52e53 authored by Seblu's avatar Seblu
Browse files
parent aac3ab2b
Loading
Loading
Loading
Loading
+12 −10
Original line number Diff line number Diff line
@@ -12,28 +12,30 @@ 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):
    # parse config file
    if os.access(settings["config"], os.R_OK):
        fparser = ConfigParser.SafeConfigParser()
            fparser.read("%s/.cc-cli.conf"%os.environ["HOME"])
        fparser.read(settings["config"])
        if fparser.has_section("cli"):
            settings.update(fparser.items("cli"))

+1 −1
Original line number Diff line number Diff line
@@ -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.