From a93832c2e3058c55e183c487dde595bd42238bb0 Mon Sep 17 00:00:00 2001
From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Wed, 27 Jun 2018 15:52:14 +0200
Subject: Fixed sdk from local file installation

Rework sdk uuid management because previous code prevented to install
local sdk using following command:
 xds-cli sdks install --file $HOME/xds-workspace/my_local_sdk.sh

Change-Id: I20bac8a76d32b005a6775e936756c96048651766
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
---
 scripts/sdks/agl/add          | 2 ++
 scripts/sdks/agl/db-dump      | 9 +++++++--
 scripts/sdks/agl/get-sdk-info | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'scripts/sdks/agl')

diff --git a/scripts/sdks/agl/add b/scripts/sdks/agl/add
index 839d647..f602fa9 100755
--- a/scripts/sdks/agl/add
+++ b/scripts/sdks/agl/add
@@ -93,6 +93,8 @@ fi
 # Compute uuid when needed
 if [ "$UUID" = "" ] && [ "$URL" != "" ]; then
     UUID=$(echo "$URL" | md5sum |cut -d' ' -f1)
+elif [ "$SDK_FILE" != "" ]; then
+    UUID=$(echo $(basename $SDK_FILE) | md5sum |cut -d' ' -f1)
 else
     echo "UUID value must be specify using --uuid option."
     exit 1
diff --git a/scripts/sdks/agl/db-dump b/scripts/sdks/agl/db-dump
index 027fdcf..ec2b1d8 100755
--- a/scripts/sdks/agl/db-dump
+++ b/scripts/sdks/agl/db-dump
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-#/**************************************************************************
+# /**************************************************************************
 # * Copyright 2017-2018 IoT.bzh
 # *
 # * author: Romain Forlot <romain.forlot@iot.bzh>
@@ -46,7 +46,7 @@ SCRIPT_PATH = os.path.dirname(os.path.abspath(
 ENV = subprocess.check_output(
     [os.path.join(SCRIPT_PATH, './_env-init.sh'), '-print']).splitlines()
 
-SDK_ROOT_DIR=None
+SDK_ROOT_DIR = None
 for elt in ENV:
     k, v = elt.decode().split('=', 1)
     if k == 'SDK_ROOT_DIR':
@@ -71,6 +71,7 @@ SDK_DB_JSON = json.load(open(SDK_DB_FILEPATH, 'r'))
 
 for one_sdk in SDK_DB_JSON:
     one_sdk['status'] = 'Not Installed'
+    one_sdk['uuid'] = ''
 
 INSTALLED_SDK = []
 for root, dirs, files in os.walk(SDK_ROOT_DIR):
@@ -106,6 +107,8 @@ for one_sdk in INSTALLED_SDK:
         logging.debug('Path not compliant, skipping')
         continue
 
+    UUID = os.path.basename(os.path.normpath(DIR))
+
     SDK_DATE = ''
     for line in open(one_sdk['VERSION_FILE']).readlines():
         if line.startswith('Timestamp'):
@@ -126,6 +129,7 @@ for one_sdk in INSTALLED_SDK:
             sdk['date'] = SDK_DATE
             sdk['setupFile'] = one_sdk['ENV_FILE']
             sdk['path'] = DIR
+            sdk['uuid'] = UUID
             break
 
     if not found:
@@ -133,6 +137,7 @@ for one_sdk in INSTALLED_SDK:
                       PROFILE + '-' + ARCH + '-' + VERSION)
         NEW_SDK = {
             'name': PROFILE + '-' + ARCH + '-' + VERSION,
+            'uuid': UUID,
             'description': 'AGL SDK ' + ARCH + ' (version ' + VERSION + ')',
             'profile': PROFILE,
             'version': VERSION,
diff --git a/scripts/sdks/agl/get-sdk-info b/scripts/sdks/agl/get-sdk-info
index c28f2e4..485d5fe 100755
--- a/scripts/sdks/agl/get-sdk-info
+++ b/scripts/sdks/agl/get-sdk-info
@@ -131,6 +131,8 @@ if [ "${UUID}" = "" ]; then
         UUID="basename ${curInstDir}"
     elif [ "$URL" != "" ]; then
         UUID=$(echo "$URL" | md5sum |cut -d' ' -f1)
+    elif [ "$filename" != "" ]; then
+        UUID=$(echo $(basename $filename) | md5sum |cut -d' ' -f1)
     else
         echo "UUID value must be specify using --uuid option."
         exit 1
@@ -147,6 +149,7 @@ fi
 read -r -d '' res <<- EndOfMessage
 {
     "name":         "${profile}_${arch}_${version}",
+    "uuid":         "${UUID}",
     "description":  "AGL SDK ${arch} (version ${version})",
     "profile":      "${profile}",
     "version":      "${version}",
-- 
cgit 1.2.3-korg