YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Display help even if input is needed

Browse source
This commit is contained in:
Kload 2013-06-01 00:13:24 +02:00
parent fee3c7c47c
commit 50d0261b52
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
README.md
View file

@ -22,19 +22,19 @@ Specifications
[-p PASSWORD] [-p PASSWORD]
user user
yunohost user info [-h] [-u USER] [-m MAIL] yunohost user info [-h] [-u USER] [-m MAIL]
### Domain ### Domain
yunohost domain list [-h] [-l LIMIT] [-o OFFSET] [-f FILTER] yunohost domain list [-h] [-l LIMIT] [-o OFFSET] [-f FILTER]
yunohost domain add [-h] [domain [domain ...]] yunohost domain add [-h] [domain [domain ...]]
yunohost domain remove [-h] [domain [domain ...]] yunohost domain remove [-h] [domain [domain ...]]
yunohost domain info [-h] domain yunohost domain info [-h] domain
yunohost domain renewcert [-h] domain yunohost domain renewcert [-h] domain
### App ### App
yunohost app updatelist [-h] [-u URL] yunohost app updatelist [-h] [-u URL]
yunohost app list [-h] [--fields FIELDS [FIELDS ...]] [-o OFFSET] yunohost app list [-h] [--fields FIELDS [FIELDS ...]] [-o OFFSET]
[-f FILTER] [-l LIMIT] [-f FILTER] [-l LIMIT]
@ -49,27 +49,27 @@ Specifications
### Firewall ### Firewall
yunohost firewall list [-h] yunohost firewall list [-h]
yunohost firewall allow [-h] {UDP,TCP,Both} port name yunohost firewall allow [-h] {UDP,TCP,Both} port name
yunohost firewall disallow [-h] name yunohost firewall disallow [-h] name
### Monitoring ### Monitoring
yunohost monitor info [-h] [-u] [-d] [-p] [-c] [-m] [-i] yunohost monitor info [-h] [-u] [-d] [-p] [-c] [-m] [-i]
yunohost monitor process [-h] [-e PROCESS] [-d PROCESS] yunohost monitor process [-h] [-e PROCESS] [-d PROCESS]
[--stop PROCESS] [-c PORT] [-i] [--stop PROCESS] [-c PORT] [-i]
[--start PROCESS] [--start PROCESS]
### Tools ### Tools
yunohost tools postinstall [-h] [-d DOMAIN] [-p PASSWORD] yunohost tools postinstall [-h] [-d DOMAIN] [-p PASSWORD]
yunohost tools maindomain [-h] [-o OLD_DOMAIN] [-n NEW_DOMAIN] yunohost tools maindomain [-h] [-o OLD_DOMAIN] [-n NEW_DOMAIN]
yunohost tools adminpw [-h] [-o OLD_PASSWORD] [-n NEW_PASSWORD] yunohost tools adminpw [-h] [-o OLD_PASSWORD] [-n NEW_PASSWORD]
yunohost tools ldapinit [-h] [-d DOMAIN] yunohost tools ldapinit [-h] [-d DOMAIN]
How to use "as is" ? How to use "as is" ?
-------------------- --------------------
@ -129,14 +129,14 @@ Development is handle with git branches and you have your own (i.e dev_beudbeud)
``` ```
git clone git@dev.yunohost.org:moulinette.git git clone git@dev.yunohost.org:moulinette.git
git checkout -b dev_beudbeud `` git checkout -b dev_beudbeud ``
git rebase origin/dev git rebase origin/dev
``` ```
Do your modifications, then : Do your modifications, then :
``` ```
git commit -am 'My commit message' git commit -am 'My commit message'
git pull origin dev (merge manually if conflicts) git pull origin dev (merge manually if conflicts)
git push origin dev_beudbeud git push origin dev_beudbeud
``` ```
Then you could ask for a 'merge request' in gitlab. Then you could ask for a 'merge request' in gitlab.
@ -146,7 +146,7 @@ Development is handle with forked repos and you have your own (i.e beudbeud/moul
``` ```
git clone https://github.com/beudbeud/moulinette.git `` git clone https://github.com/beudbeud/moulinette.git ``
git checkout -b dev git checkout -b dev
git rebase origin/dev git rebase origin/dev
``` ```
Do your modifications, then: Do your modifications, then:

2
parse_args
View file

@ -105,6 +105,8 @@ def parse_dict(action_map):
if 'ask' in arg_params: if 'ask' in arg_params:
require_input = True require_input = True
if '-h' in sys.argv or '--help' in sys.argv:
require_input = False
if (category != sys.argv[1]) or (action != sys.argv[2]): if (category != sys.argv[1]) or (action != sys.argv[2]):
require_input = False require_input = False
for name in arg_names: for name in arg_names: