diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-08 15:46:27 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-09 14:20:48 -0500 |
commit | 20e7d270d9cdc3126fa159ccd2870f8e24d7d0c8 (patch) | |
tree | 4bfc9ef43a3a1e70eadd1092d6b41ffed6840acc | |
parent | bfadf1da7d8f44a883b126d67ec0a3582db80342 (diff) |
Improve the help messages for librechroot and libremakepkg
-rwxr-xr-x | src/chroot-tools/librechroot | 31 | ||||
-rwxr-xr-x | src/chroot-tools/libremakepkg | 23 |
2 files changed, 29 insertions, 25 deletions
diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 0770ad6..cacdfcd 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -43,25 +43,28 @@ usage() { echo "Usage: $cmd [OPTIONS] " echo 'Interacts with a chroot.' echo '' - echo "The default CHROOT is \`${CHROOT}'." + echo 'This command will make the following configuration changes in' + echo 'the chroot:' + echo " - overwrite \`/etc/libretools.d/chroot.conf'" + echo " - overwrite \`/etc/pacman.d/mirrorlist'" + echo " - set \`CacheDir' in \`/etc/pacman.conf'" echo '' echo 'Options:' echo ' Settings:' - echo " -n <CHROOT> Use this chroot instead of \`$CHROOT'" - echo ' -l <COPY> Use this as the chroot copy instead of basing it' - echo ' on the username' - echo ' -N Disable networking in the chroot' + echo " -n <CHROOT> Use this chroot instead of \`$CHROOT'" + echo " -l <COPY> Use this chroot copy instead \`$CHROOTCOPY'" + echo ' -N Disable networking in the chroot' echo '' echo ' Modes: (the last mode given will be used)' - echo ' -C Clean /repo in the chroot' - echo ' -c Clean the packages installed in the chroot' - echo ' -I <FILE> Install the package FILE into the chroot' - echo ' -i <PKG> Install the package PKG from repos into the chroot' - echo ' -m Make sure the chroot exists; do nothing else' - echo ' -r <CMD> Run CMD in the chroot' - echo " -s Sync the copy with the 'root' copy" - echo ' -u Update the chroot' - echo ' -h Print this message' + echo ' -C Clean /repo in the chroot' + echo ' -c Clean the packages installed in the chroot' + echo ' -I <FILE> Install the package FILE into the chroot' + echo ' -i <PKG> Install the package PKG from repos into the chroot' + echo ' -m Make sure the chroot exists; do nothing else' + echo ' -r <CMD> Run CMD in the chroot' + echo " -s Sync the copy with the \`root' copy" + echo ' -u Update the chroot' + echo ' -h Show this message' } main() { diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index 0276315..15f5822 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -111,17 +111,18 @@ check_pkg() { cmd=${0##*/} usage() { - echo "Usage: $cmd [options] [-- makepkg args]" - echo 'This program will build your package.' - echo '' - echo 'OPTIONS:' - echo " -n <CHROOT> Use this chroot instead of \`$CHROOT'" - echo ' -l <COPY> Use this chroot copy instead of basing it' - echo ' on the username' - echo '' - echo " -m <MAKEPKG> Use the command MAKEPKG instead of 'makepkg'" - echo '' - echo ' -h Show this message' + echo "Usage: $cmd [options] [-- makepkg args]" + echo 'This program will build your package.' + echo '' + echo 'If run from outside of a chroot, this will set PKGDEST and' + echo "SRCDEST in the chroot's \`/etc/makepkg.conf', as well as making" + echo "whataver alterations to the chroot \`librechroot' makes." + echo '' + echo 'Options:' + echo " -n <CHROOT> Use this chroot instead of \`$CHROOT'" + echo " -l <COPY> Use this chroot copy instead \`$CHROOTCOPY'" + echo " -m <MAKEPKG> Use the command MAKEPKG instead of \'makepkg'" + echo ' -h Show this message' } main() { |