summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-06-21 14:47:10 +0200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-06-21 21:49:15 +0200
commit8bfdc82b618ab4e097bd49de5157e21e581dc854 (patch)
treedb600bcc175f509d5fc811876f1cb645f43d43c0
parent1d9a88f635549e68562de681e297b9270ad02d4e (diff)
downloadopenembedded-core-contrib-paule/memres-init-param-order.tar.gz
openembedded-core-contrib-paule/memres-init-param-order.tar.bz2
openembedded-core-contrib-paule/memres-init-param-order.zip
oe-init-build-env-memres: swap parameter orderpaule/memres-init-param-order
This script expected the port number to be specified first, which is somewhat counter-intuitive especially if you're used to oe-init-build-env; besides, in local usage you are unlikely to need to specify a custom port. Given that few people are using this yet (based on the issues I have recently fixed), switch the arguments around so that the two scripts behave consistently. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rwxr-xr-xoe-init-build-env-memres12
1 files changed, 6 insertions, 6 deletions
diff --git a/oe-init-build-env-memres b/oe-init-build-env-memres
index 9e1425ea83..3f0d239a10 100755
--- a/oe-init-build-env-memres
+++ b/oe-init-build-env-memres
@@ -19,18 +19,18 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Normally this is called as '. ./oe-init-build-env-memres <portnumber> <builddir>'
+# Normally this is called as '. ./oe-init-build-env-memres <builddir> [portnumber]'
#
# This works in most shells (not dash), but not all of them pass the arguments
-# when being sourced. To workaround the shell limitation use "set <portnumber>
-# <builddir>" prior to sourcing this script.
+# when being sourced. To workaround the shell limitation use "set <builddir>
+# [portnumber]" prior to sourcing this script.
#
-if [ -z "$1" ]; then
+if [ -z "$2" ]; then
echo "No port specified, using dynamically selected port"
port=-1
else
- port=$1
- shift
+ port=$2
+ set -- "$1" "$3" "$4" "$5" "$6"
fi
if [ -n "$BASH_SOURCE" ]; then