From: Michael Prokop Date: Thu, 24 Jan 2019 08:35:29 +0000 (+0100) Subject: zsh-completion: improve wording and list of available options to better match reality X-Git-Tag: v0.87~3 X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=83408f346e63daa1db627cab8a33002290ac424f;ds=inline zsh-completion: improve wording and list of available options to better match reality The --mntpoint option is quite unimportant, whereas --grub, --password and --bootappend all require an argument. Instead the --hostname is quite important. Adjust accordingly. Add related debian/post* scripts for proper dpkg-maintscript-helper rm_conffile support. --- diff --git a/TODO b/TODO index d28e753..21d7c5c 100644 --- a/TODO +++ b/TODO @@ -15,7 +15,6 @@ TODO list for grml-debootstrap * support rpmstrap (bootstrap a basic RPM-based system) -> http://xen-tools.org/software/rinse/ * support automatic installation of Gentoo -* provide zsh-completion for grml-debootstrap's cmdline variables (in progress) * support installation on usb-pen (like grml2usb for Debian) -> http://blog.256bit.org/archives/172-Debian-in-der-Hosentasche.html#extended * support adduser for new user who has same permissions as an user created by d-i diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..38bb1a8 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +#DEBHELPER# + +exit 0 diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..38bb1a8 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +#DEBHELPER# + +exit 0 diff --git a/zsh-completion b/zsh-completion index 2e80cd6..2755b64 100644 --- a/zsh-completion +++ b/zsh-completion @@ -8,15 +8,15 @@ ################################################################################ _arguments -s \ - '(-h --help)'{-h,--help}'[this help text]:' \ + '(-h --help)'{-h,--help}'[display usage information]:' \ '(-v --version)'{-v,--version}'[display version information]:' \ - '(-m --mirror)'{-m,--mirror}'[specify mirror for apt{-get,itude}]:mirror' \ - '(-p --mntpoint)'{-p,--mntpoint}'[mountpoint for the target system]:mount point:_path_files' \ + '(-m --mirror)'{-m,--mirror}'[specify Debian mirror]:mirror' \ '(-r --release)'{-r,--release}'[specify the release name of the new system]:release' \ '(-t --target)'{-t,--target}'[target partition or directory]:device or directory:_path_files' \ - '--grub[installation device for grub]' \ - '--password[specify password for root user]' \ - '--bootappend[appendline for kernel]' + '--hostname[specify hostname for target system]:hostname' \ + '--grub[installation device for grub]:device or directory:_path_files' \ + '--password[specify password for root user]:password' \ + '--bootappend[appendline for kernel]:kernel-options' ## END OF FILE ################################################################# # vim:ft=zsh