* [PATCH] oe-setup-rpmrepo: standardize usage output
@ 2016-12-09 14:19 Ed Bartosh
0 siblings, 0 replies; only message in thread
From: Ed Bartosh @ 2016-12-09 14:19 UTC (permalink / raw)
To: openembedded-core
Made usage output of oe-setup-rpmrepo to look similar to the
output of other oe scripts.
[YOCTO #10751]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
scripts/oe-setup-rpmrepo | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/scripts/oe-setup-rpmrepo b/scripts/oe-setup-rpmrepo
index 917b98b..7dcded8 100755
--- a/scripts/oe-setup-rpmrepo
+++ b/scripts/oe-setup-rpmrepo
@@ -23,16 +23,6 @@
# Instead, use OE_TMPDIR for passing this in externally.
TMPDIR="$OE_TMPDIR"
-function usage() {
- echo "Usage: $0 <rpm-dir>"
- echo " <rpm-dir>: default is $TMPDIR/deploy/rpm"
-}
-
-if [ $# -gt 1 ]; then
- usage
- exit 1
-fi
-
setup_tmpdir() {
if [ -z "$TMPDIR" ]; then
# Try to get TMPDIR from bitbake
@@ -53,6 +43,23 @@ setup_tmpdir() {
fi
}
+setup_tmpdir
+
+function usage() {
+ echo 'Usage: oe-setup-rpmrepo rpm-dir'
+ echo ''
+ echo 'OpenEmbedded setup-rpmrepo - setup rpm repository'
+ echo ''
+ echo 'arguments:'
+ echo " rpm-dir rpm repo directory, default is $TMPDIR/deploy/rpm"
+ echo ''
+}
+
+if [ $# -gt 1 -o "$1" = '--help' -o "$1" = '-h' ]; then
+ usage
+ exit 2
+fi
+
setup_sysroot() {
# Toolchain installs set up $OECORE_NATIVE_SYSROOT in their
# environment script. If that variable isn't set, we're
@@ -68,7 +75,6 @@ setup_sysroot() {
fi
}
-setup_tmpdir
setup_sysroot
--
2.1.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-12-09 14:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-09 14:19 [PATCH] oe-setup-rpmrepo: standardize usage output Ed Bartosh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.