Test framework or simply a user may need to set XDT_SDK variable even
if /etc/xdtrc file exists.
Also change default location of webapp to www to allow to run xds-server
without the need to set any config file.
Change-Id: I403778e597cbcfd2c16d5ab6b603073ed3a230f0
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
NoFolderConfig: cliCtx.GlobalBool("no-folderconfig"),
},
FileConf: FileConfig{
NoFolderConfig: cliCtx.GlobalBool("no-folderconfig"),
},
FileConf: FileConfig{
- WebAppDir: "webapp/dist",
ShareRootDir: dfltShareDir,
SdkScriptsDir: DefaultSdkScriptsDir,
XdsUtilsScriptsDir: DefaultXdsUtilsScriptsDir,
ShareRootDir: dfltShareDir,
SdkScriptsDir: DefaultSdkScriptsDir,
XdsUtilsScriptsDir: DefaultXdsUtilsScriptsDir,
# limitations under the License.
###########################################################################
# limitations under the License.
###########################################################################
-[ -f /etc/xdtrc ] && . /etc/xdtrc
-
if [ -z "$XDT_SDK" ]; then
if [ -z "$XDT_SDK" ]; then
- # For backward compatibility and compliance with AGL DevKit docker image
- [ -d "/xdt/sdk" ] && export XDT_SDK=/xdt/sdk || export XDT_SDK=$HOME/xds-workspace/.sdks
+ [ -f /etc/xdtrc ] && . /etc/xdtrc
+
+ if [ -z "$XDT_SDK" ]; then
+ # For backward compatibility and compliance with AGL DevKit docker image
+ [ -d "/xdt/sdk" ] && export XDT_SDK=/xdt/sdk || export XDT_SDK=$HOME/xds-workspace/.sdks
+ fi
fi
export SDK_FAMILY_NAME="agl"
fi
export SDK_FAMILY_NAME="agl"
export SDK_ENV_SETUP_FILENAME="environment-setup-*"
export SDK_DATABASE="http://iot.bzh/download/public/XDS/sdk/sdks_latest.json"
export SDK_ENV_SETUP_FILENAME="environment-setup-*"
export SDK_DATABASE="http://iot.bzh/download/public/XDS/sdk/sdks_latest.json"
-[ "$1" = "-print" ] && { env; }
\ No newline at end of file
+[ "$1" = "-print" ] && { env; }