diff options
-rwxr-xr-x | src/abslibre-tools/librerelease | 17 | ||||
-rwxr-xr-x | src/chroot-tools/librechroot | 15 | ||||
-rwxr-xr-x | src/chroot-tools/libremakepkg | 7 |
3 files changed, 22 insertions, 17 deletions
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index df47d85..709d379 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -129,13 +129,16 @@ usage() { print "Usage: %s [OPTIONS]" "${0##*/}" print 'Upload packages in $WORKDIR/staging to the Parabola server' echo - prose 'By default, `librerelease` expects the runtime-determined `$LIBREUSER`, - to match the hackers.git login for which $LIBREUSER has credentials. - $LIBREUSER is normally the current local login; but may be - over-ridden by setting $SUDO_USER in the environment. - If no local logins exist, which match your hackers.git login, - you can specify `$REPOUSER` as the remote login for `librerelease`, - in the `configuration` section of /usr/lib/libretools/conf.sh,' + prose 'By default, `librerelease` expects the $LIBREUSER + to match the hackers.git login for which $LIBREUSER has credentials.' + prose '$LIBREUSER is determined at runtime, per /usr/lib/libretools/conf.sh. + $LIBREUSER is normally the login of the invoking user, per $SUDO_USER; + but may be over-ridden by setting $LIBREUSER + in the `configuration` section of conf.sh.' + prose 'If $LIBREUSER does not match the hackers.git login, + for which $LIBREUSER has the repo login credentials, + you must specify `$REPOUSER` as the remote login, + in the `configuration` section of conf.sh.' echo print "Options:" flag '-c' 'Clean; delete packages in $WORKDIR/staging' diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 8a9f0e4..c24ce29 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -238,16 +238,17 @@ usage() { bullet '$CHROOTEXTRAPKG' echo prose 'Each chroot is named; and there may be multiple chroots; all of which, - are stored in $CHROOTDIR, with the default chroot name being: $CHROOT. + are stored in $CHROOTDIR, with the default chroot name being: $CHROOT, + as set in chroot.conf. Each named chroot has a pristine, read-only master system (`root`), which is used as the seed for any number of named working copies, which may be derived from it. - If a working copy is not specified, the default is the $LIBREUSER, - determined at runtime, per /usr/lib/libretools/conf.sh. - $LIBREUSER is normally the current local login; but may be - over-ridden by setting $SUDO_USER in the environment.' - echo - prose 'Unless the working copy is manually specified as an absolute path, + If a working copy is not specified, the default is: $LIBREUSER.' + prose '$LIBREUSER is determined at runtime, per /usr/lib/libretools/conf.sh. + $LIBREUSER is normally the login of the invoking user, per $SUDO_USER; + but may be over-ridden by setting $LIBREUSER + in the `configuration` section of conf.sh.' + prose 'If the working copy is not explicitly specified as an absolute path, the path to the working copy ($copydir) will determined at runtime:' print ' $CHROOTDIR/$CHROOT/$COPY' echo diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index f6c6c80..1b29c3e 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -39,7 +39,7 @@ readonly INCHROOT=$([[ -f /.arch-chroot ]] && echo true || echo false) NONET=true # can be changed with the -N flag # {PKG,SRC,SRCPKG,LOG}DEST set at runtime by makepkg.conf # MAKEFLAGS, PACKAGER set at runtime by makepkg.conf -# LIBREUSER, LIBREHOME are set by conf.sh +# LIBREUSER, LIBREHOME set by conf.sh librechroot_flags=() # Hooks ######################################################################## @@ -160,8 +160,9 @@ usage() { as the GPG pubring of the chroot `builduser`' bullet 'add a pacman repositoriy of locally built packages' prose '$LIBREUSER is determined at runtime, per /usr/lib/libretools/conf.sh. - $LIBREUSER is normally the local login of the invoking user; - but may be over-ridden by setting $SUDO_USER in the environment.' + $LIBREUSER is normally the login of the invoking user, per $SUDO_USER; + but may be over-ridden by setting $LIBREUSER + in the `configuration` section of conf.sh.' echo prose 'This command is configured both with `chroot.conf` (either in `/etc/libretools.d/` or `$XDG_CONFIG_HOME/libretools/`), and with |