diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-12-17 16:48:55 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-18 13:51:54 +0000 |
| commit | 3960b6ec5c34e2136682e56b2883b69efa0a2693 (patch) | |
| tree | 2642d81e2eea7394d50f18e1bb669444611adb13 | |
| parent | b194c0c00a2d7fb96e9eaef43c770b15fcebb0b9 (diff) | |
| download | poky-3960b6ec5c34e2136682e56b2883b69efa0a2693.tar.gz | |
bitbake: toaster: move setting of default values
Set default values of script parameters just before
they are parsed to increase readability.
(Bitbake rev: 627f0d6adcfe281ef0487bf15a35151f1ceff194)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | bitbake/bin/toaster | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 6dd20c11d1..7cecc7b3cd 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster | |||
| @@ -159,12 +159,7 @@ fi | |||
| 159 | BBBASEDIR=`dirname $TOASTER`/.. | 159 | BBBASEDIR=`dirname $TOASTER`/.. |
| 160 | MANAGE=$BBBASEDIR/lib/toaster/manage.py | 160 | MANAGE=$BBBASEDIR/lib/toaster/manage.py |
| 161 | OEROOT=`dirname $TOASTER`/../.. | 161 | OEROOT=`dirname $TOASTER`/../.. |
| 162 | NOTOASTERUI=0 | 162 | |
| 163 | WEBSERVER=1 | ||
| 164 | TOASTER_BRBE="" | ||
| 165 | if [ "$WEB_PORT" = "" ]; then | ||
| 166 | WEB_PORT="8000" | ||
| 167 | fi | ||
| 168 | # this is the configuraton file we are using for toaster | 163 | # this is the configuraton file we are using for toaster |
| 169 | # we are using the same logic that oe-setup-builddir uses | 164 | # we are using the same logic that oe-setup-builddir uses |
| 170 | # (based on TEMPLATECONF and .templateconf) to determine | 165 | # (based on TEMPLATECONF and .templateconf) to determine |
| @@ -206,7 +201,11 @@ fi | |||
| 206 | # make sure that the toaster.sqlite file doesn't default to `pwd` like it currently does. | 201 | # make sure that the toaster.sqlite file doesn't default to `pwd` like it currently does. |
| 207 | export TOASTER_DIR=`pwd` | 202 | export TOASTER_DIR=`pwd` |
| 208 | 203 | ||
| 204 | NOTOASTERUI=0 | ||
| 205 | WEBSERVER=1 | ||
| 209 | NOBROWSER=0 | 206 | NOBROWSER=0 |
| 207 | TOASTER_BRBE="" | ||
| 208 | WEB_PORT="8000" | ||
| 210 | 209 | ||
| 211 | for param in $*; do | 210 | for param in $*; do |
| 212 | case $param in | 211 | case $param in |
