X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fxds-utils%2Finstall-agl-sdks.sh;h=0491b24e5472618616d32b8914727e0142a9653a;hb=f1c182ede3c4aed0d6196d05b0a64ff93372e755;hp=36849f976fee5b1d7b795f271a1ca2bc008b1bfc;hpb=acdff5a1bc9028bd79eeba16d507ea4c652b4185;p=src%2Fxds%2Fxds-server.git

diff --git a/scripts/xds-utils/install-agl-sdks.sh b/scripts/xds-utils/install-agl-sdks.sh
index 36849f9..0491b24 100755
--- a/scripts/xds-utils/install-agl-sdks.sh
+++ b/scripts/xds-utils/install-agl-sdks.sh
@@ -1,18 +1,36 @@
 #!/bin/bash
+ ###########################################################################
+# Copyright 2017 IoT.bzh
+#
+# author: Sebastien Douheret <sebastien@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
 
 . /etc/xdtrc
 
-[ -z "$SDK_BASEURL" ] && SDK_BASEURL="http://iot.bzh/download/public/2017/XDS/sdk/"
+[ -z "$SDK_BASEURL" ] && SDK_BASEURL="http://iot.bzh/download/public/XDS/sdk/"
 [ -z "$XDT_SDK" ] && XDT_SDK=/xdt/sdk
 
 # Support only poky_agl profile for now
 PROFILE="poky-agl"
 
-SDKS=$(curl -s ${SDK_BASEURL} | grep -oP  'href="[^"]*.sh"' | cut -d '"' -f 2)
+# Dynamically retreive SDKs (reduce timeout in case of iot website is not available)
+SDKS=$(curl -s ${SDK_BASEURL} --connect-timeout 10 | grep -oP  'href="[^"]*.sh"' | cut -d '"' -f 2) || echo "WARNING: IoT.bzh download site not available."
 
 usage() {
     echo "Usage: $(basename $0) [-h|--help] [-clean] [-f|--file <agl-sdk-filename>] [-a|--arch <arch name>] [-l|--list]"
-	echo "For example, arch name is: aarch64, armv7vehf or x86-64"
+	echo "For example, arch name is: aarch64, armv7vehf or corei7-64"
 	exit 1
 }
 
@@ -61,19 +79,26 @@ while [ $# -ne 0 ]; do
     shift
 done
 
+if [ "$ARCH" = "x86-64" ]; then
+    echo "Warning x86-64 architure name is deprecated, please use corei7-64 instead !"
+    exit 1
+fi
+
 [ ! -d ${XDT_SDK} ] && mkdir -p ${XDT_SDK}
 
 if [ "$FILE" = "" ]; then
     FILE=$(getFile $ARCH)
-    SDK_FILE=${XDT_SDK}/${FILE}
-    if [ "$?" != 0 ]; then
+    if [ "$?" != "0" ]; then
+        echo "$FILE"
         exit 1
     fi
-elif [ ! -f $FILE ]; then
+    SDK_FILE=${XDT_SDK}/${FILE}
+elif [ ! -f "$FILE" ]; then
     echo "SDK file not found: $FILE"
     exit 1
 else
     DIR=$(cd $(dirname $FILE); pwd)
+    FILE=$(basename $FILE)
     SDK_FILE=${DIR}/${FILE}
 fi
 
@@ -101,14 +126,14 @@ cleanExit ()
 }
 
 # Get SDK installer
-if [ ! -f ${SDK_FILE} ]; then
+if [ ! -f "${SDK_FILE}" ]; then
     do_cleanup=true
-    wget "$SDK_BASEURL/$FILE" -O ${SDK_FILE} || exit 1
+    wget "$SDK_BASEURL/$FILE" -O "${SDK_FILE}" || exit 1
 fi
 
 # Retreive default install dir to extract version
-offset=$(grep -na -m1 "^MARKER:$" ${SDK_FILE} | cut -d':' -f1)
-eval $(head -n $offset ${SDK_FILE} | grep ^DEFAULT_INSTALL_DIR= )
+offset=$(grep -na -m1 "^MARKER:$" "${SDK_FILE}" | cut -d':' -f1)
+eval $(head -n $offset "${SDK_FILE}" | grep ^DEFAULT_INSTALL_DIR= )
 VERSION=$(basename $DEFAULT_INSTALL_DIR)
 
 [ "$PROFILE" = "" ] && { echo "PROFILE is not set"; exit 1; }