summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/xdsconfig/config.go2
-rwxr-xr-xscripts/sdks/agl/_env-init.sh12
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index bab3abd..046950d 100644
--- a/lib/xdsconfig/config.go
+++ b/lib/xdsconfig/config.go
@@ -100,7 +100,7 @@ func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
NoFolderConfig: cliCtx.GlobalBool("no-folderconfig"),
},
FileConf: FileConfig{
- WebAppDir: "webapp/dist",
+ WebAppDir: "www",
ShareRootDir: dfltShareDir,
SdkScriptsDir: DefaultSdkScriptsDir,
XdsUtilsScriptsDir: DefaultXdsUtilsScriptsDir,
diff --git a/scripts/sdks/agl/_env-init.sh b/scripts/sdks/agl/_env-init.sh
index 9d4b398..cc91107 100755
--- a/scripts/sdks/agl/_env-init.sh
+++ b/scripts/sdks/agl/_env-init.sh
@@ -17,11 +17,13 @@
# limitations under the License.
###########################################################################
-[ -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
+ [ -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"
@@ -29,4 +31,4 @@ export SDK_ROOT_DIR="$XDT_SDK"
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; }