summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/cli/bitmask_cli.py
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-02-20 20:39:43 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-02-23 00:41:25 +0100
commit25ad6f18057ad7951f74eff35afe25d220952efa (patch)
treebfcb70fde93f73f993a3ae42f7c3def73464e105 /src/leap/bitmask/cli/bitmask_cli.py
parent9d7de357a114812c0ed1e04b97ef59b41a40fa47 (diff)
[refactor] rename eip to vpn
Diffstat (limited to 'src/leap/bitmask/cli/bitmask_cli.py')
-rwxr-xr-xsrc/leap/bitmask/cli/bitmask_cli.py20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py
index 933b824..0c037b2 100755
--- a/src/leap/bitmask/cli/bitmask_cli.py
+++ b/src/leap/bitmask/cli/bitmask_cli.py
@@ -25,14 +25,14 @@ import signal
from colorama import Fore
from twisted.internet import reactor, defer
-from leap.bitmask.config import Configuration
-from leap.bitmask.cli.eip import Eip
+from leap.bitmask.cli import command
from leap.bitmask.cli.keys import Keys
+from leap.bitmask.cli.logs import Logs
from leap.bitmask.cli.mail import Mail
-from leap.bitmask.cli.webui import WebUI
-from leap.bitmask.cli import command
from leap.bitmask.cli.user import User
-from leap.bitmask.cli.logs import Logs
+from leap.bitmask.cli.vpn import VPN
+from leap.bitmask.cli.webui import WebUI
+from leap.bitmask.config import Configuration
class BitmaskCLI(command.Command):
@@ -44,10 +44,10 @@ SERVICE COMMANDS:
user Handles Bitmask accounts
mail Bitmask Encrypted Mail
- eip Encrypted Internet Proxy
+ vpn Bitmask VPN
keys Bitmask Keymanager
ui Bitmask User Interface
- logs Manages bitmask daemon logs
+ logs Manages the Bitmask daemon logs
GENERAL COMMANDS:
@@ -74,9 +74,15 @@ OPTIONAL ARGUMENTS:
mail = Mail(self.cfg, self.print_json)
return mail.execute(raw_args)
+<<<<<<< HEAD
def eip(self, raw_args):
eip = Eip(self.cfg, self.print_json)
return eip.execute(raw_args)
+=======
+ def vpn(self, raw_args):
+ vpn = VPN()
+ return vpn.execute(raw_args)
+>>>>>>> [refactor] rename eip to vpn
def keys(self, raw_args):
keys = Keys(self.cfg, self.print_json)