live-wrapper was testing if hooks/customise.sh exists but it was executing hooks/customize.sh instead Adopt a single spelling for coherence As both are correct, adopt "customize" to be coherent to the argument --customize ---
Path based on git://anonscm.debian.org/debian-live/live-wrapper.git Resending with git send-email -M to detect renames and be easier to review bin/lwr | 4 ++-- debian/live-wrapper.install | 2 +- doc/quickstart.rst | 2 +- hooks/{customise.sh => customize.sh} | 2 +- lwr/vm.py | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) rename hooks/{customise.sh => customize.sh} (90%) diff --git a/bin/lwr b/bin/lwr index de1fef6..0ebf180 100755 --- a/bin/lwr +++ b/bin/lwr @@ -211,9 +211,9 @@ class LiveWrapper(cliapp.Application): # Create work directory self.cdroot = tempfile.mkdtemp() # all other directories are based off this - logging.debug("Setting environment variables for customise hook...") + logging.debug("Setting environment variables for customize hook...") - # Make options available to customise hook in vmdebootstrap + # Make options available to customize hook in vmdebootstrap os.environ['LWR_MIRROR'] = self.settings['mirror'] os.environ['LWR_DISTRIBUTION'] = self.settings['distribution'] os.environ['LWR_TASK_PACKAGES'] = self.settings['tasks'] diff --git a/debian/live-wrapper.install b/debian/live-wrapper.install index 77e500e..652e4c9 100644 --- a/debian/live-wrapper.install +++ b/debian/live-wrapper.install @@ -1,3 +1,3 @@ usr/bin usr/lib -hooks/customise.sh usr/share/live-wrapper +hooks/customize.sh usr/share/live-wrapper diff --git a/doc/quickstart.rst b/doc/quickstart.rst index bbcad77..bd57ce0 100644 --- a/doc/quickstart.rst +++ b/doc/quickstart.rst @@ -25,7 +25,7 @@ Customising the Image --------------------- There are a number of supported command-line arguments that can be passed to -live-wrapper. These change the behaviour to create a customised image. +live-wrapper. These change the behaviour to create a customized image. Changing the Distribution ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/hooks/customise.sh b/hooks/customize.sh similarity index 90% rename from hooks/customise.sh rename to hooks/customize.sh index abb5bf0..b5a0178 100755 --- a/hooks/customise.sh +++ b/hooks/customize.sh @@ -5,7 +5,7 @@ set -e rootdir=$1 # common needs rootdir to already be defined. -. /usr/share/vmdebootstrap/common/customise.lib +. /usr/share/vmdebootstrap/common/customize.lib trap cleanup 0 diff --git a/lwr/vm.py b/lwr/vm.py index 8a8fa35..90673f5 100644 --- a/lwr/vm.py +++ b/lwr/vm.py @@ -29,7 +29,7 @@ class VMDebootstrap(object): def __init__(self, distribution, architecture, mirror=None, cdroot='/tmp/'): self.cdroot = cdroot - # FIXME: The customise script needs to be specified in the command line + # FIXME: The customize script needs to be specified in the command line # arguments, falling back to /usr/share/vmdebootstrap/hooks/customize.sh # if no script is specified and hooks/customize.sh does not exist in # the current directory. @@ -49,11 +49,11 @@ class VMDebootstrap(object): # FIXME: Logging should happen here if os.path.exists(os.path.join(".", "hooks", "customize.sh")): - self.args.extend(["--customize", "hooks/customise.sh"]) - elif os.path.exists("/usr/share/live-wrapper/customise.sh"): - self.args.extend(["--customize", "/usr/share/live-wrapper/customise.sh"]) + self.args.extend(["--customize", "hooks/customize.sh"]) + elif os.path.exists("/usr/share/live-wrapper/customize.sh"): + self.args.extend(["--customize", "/usr/share/live-wrapper/customize.sh"]) else: - raise cliapp.AppException("Could not locate customise.sh") + raise cliapp.AppException("Could not locate customize.sh") def run(self): print(' '.join(self.args)) -- 2.7.4