From dbe3c6efd5ceb882bb2437269272e174e04ce8b8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 5 May 2017 20:20:32 -0400 Subject: libremakepkg: update usage() text --- src/chroot-tools/libremakepkg | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index cd9e60e..019bae1 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -137,20 +137,22 @@ usage() { print "Usage: %s [options]" "${0##*/}" print 'This program will build your package.' echo - prose 'If run from outside of a chroot, command will make the following - configuration changes in the chroot:' + prose 'If run from outside of a chroot, this command will make the + following configuration changes in the chroot:' bullet 'whatever changes `librechroot` makes.' bullet 'set `{PKG,SRC,SRCPKG,LOG}DEST` in `/etc/makepkg.conf`' - bullet 'set `PACKAGER` in `/etc/makepkg.conf` to reflect the value - outside of the chroot.' - bullet '(maybe) delete `/build/.makepkg.conf`' - bullet '(maybe) delete `/build/.ssh/config`' - prose 'If run from inside of a chroot, this command will:' - bullet '(maybe) delete `~/.makepkg.conf`' - bullet '(maybe) delete `~/.ssh/config`' - prose 'The above "maybe"s happen as part of the workarounds to make - distcc work in a network-less environment. They will happen if - both `socat` and `distcc` are installed in the chroot.' + bullet 'set `MAKEFLAGS` and `PACKAGER` in `/etc/makepkg.conf` to reflect + the value outside of the chroot.' + bullet 'create a `builduser` with the same numeric UID as the + invoking $SUDO_USER.' + bullet 'lets this `builduser` call `sudo pacman` without a password.' + bullet 'adds a pacman repositoriy of locally built packages' + echo + prose 'This command is configured both with `chroot.conf` (either in + `/etc/libretools.d/` or `$XDG_CONFIG_HOME/libretools/`), and with + makepkg.conf(5). However, similarly to makepkg(8), it lets + environment variables for {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and + PACKAGER override the settings in makepkg.conf(5).' echo prose 'The `-n` and `-l` options behave identically to librechroot, see the documentation there.' -- cgit v1.2.2