Revision f8d01158
| b/Makefile.am | ||
|---|---|---|
| 182 | 182 |
if WANT_HTOOLS |
| 183 | 183 |
HTOOLS_GENERATED_FILES += $(HS_PROGS) |
| 184 | 184 |
if ENABLE_CONFD |
| 185 |
HTOOLS_GENERATED_FILES += htools/hconfd |
|
| 185 |
HTOOLS_GENERATED_FILES += htools/hconfd htools/ganeti-confd
|
|
| 186 | 186 |
endif |
| 187 | 187 |
endif |
| 188 | 188 |
|
| b/autotools/build-bash-completion | ||
|---|---|---|
| 27 | 27 |
# [C0103] Invalid name build-bash-completion |
| 28 | 28 |
|
| 29 | 29 |
import os |
| 30 |
import os.path |
|
| 30 | 31 |
import re |
| 31 | 32 |
import itertools |
| 32 | 33 |
import optparse |
| ... | ... | |
| 641 | 642 |
opts = opts.split(",")
|
| 642 | 643 |
if kind == "none": |
| 643 | 644 |
return cli.cli_option(*opts, action="store_true") |
| 644 |
elif kind in ["file", "string", "host", "dir"]: |
|
| 645 |
elif kind in ["file", "string", "host", "dir", "inetaddr"]:
|
|
| 645 | 646 |
return cli.cli_option(*opts, type="string") |
| 646 | 647 |
elif kind == "numeric": |
| 647 | 648 |
# FIXME: float values here |
| ... | ... | |
| 718 | 719 |
script_name = script |
| 719 | 720 |
func_name = "htools_%s" % script |
| 720 | 721 |
else: |
| 721 |
# note: this is not yet used (daemons) |
|
| 722 |
cmd = script |
|
| 722 |
cmd = "./" + script |
|
| 723 | 723 |
env = {}
|
| 724 |
script_name = script
|
|
| 725 |
func_name = script |
|
| 724 |
script_name = os.path.basename(script)
|
|
| 725 |
func_name = script_name
|
|
| 726 | 726 |
output = utils.RunCmd([cmd, "--help-completion"], env=env, cwd=".").output |
| 727 | 727 |
cli_opts = [] |
| 728 | 728 |
args = [] |
| ... | ... | |
| 786 | 786 |
WriteHaskellCompletion(sw, script, htools=True, |
| 787 | 787 |
debug=not options.compact) |
| 788 | 788 |
|
| 789 |
# ganeti-confd, if enabled |
|
| 790 |
if _autoconf.ENABLE_CONFD: |
|
| 791 |
WriteHaskellCompletion(sw, "htools/ganeti-confd", htools=False, |
|
| 792 |
debug=not options.compact) |
|
| 793 |
|
|
| 789 | 794 |
# Reset extglob to original value |
| 790 | 795 |
sw.Write("[[ -n \"$gnt_shopt_extglob\" ]] && $gnt_shopt_extglob")
|
| 791 | 796 |
sw.Write("unset gnt_shopt_extglob")
|
| b/autotools/run-in-tempdir | ||
|---|---|---|
| 17 | 17 |
ln -T -s $tmpdir/ganeti $tmpdir/lib |
| 18 | 18 |
|
| 19 | 19 |
mkdir -p $tmpdir/htools $tmpdir/htest |
| 20 |
for hfile in htools; do |
|
| 20 |
for hfile in htools ganeti-confd; do
|
|
| 21 | 21 |
if [ -e htools/$hfile ]; then |
| 22 | 22 |
cp -p htools/$hfile $tmpdir/htools/ |
| 23 | 23 |
fi |
Also available in: Unified diff