Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed build error in Typescript 2.x and RxJS 5.x
[src/xds/xds-server.git]
/
scripts
/
xds-utils
/
install-agl-sdks.sh
diff --git
a/scripts/xds-utils/install-agl-sdks.sh
b/scripts/xds-utils/install-agl-sdks.sh
index
7e4eb76
..
f230569
100755
(executable)
--- a/
scripts/xds-utils/install-agl-sdks.sh
+++ b/
scripts/xds-utils/install-agl-sdks.sh
@@
-12,7
+12,7
@@
SDKS=$(curl -s ${SDK_BASEURL} | grep -oP 'href="[^"]*.sh"' | cut -d '"' -f 2)
usage() {
echo "Usage: $(basename $0) [-h|--help] [-clean] [-f|--file <agl-sdk-filename>] [-a|--arch <arch name>] [-l|--list]"
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
}
exit 1
}
@@
-61,19
+61,26
@@
while [ $# -ne 0 ]; do
shift
done
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)
[ ! -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
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)
echo "SDK file not found: $FILE"
exit 1
else
DIR=$(cd $(dirname $FILE); pwd)
+ FILE=$(basename $FILE)
SDK_FILE=${DIR}/${FILE}
fi
SDK_FILE=${DIR}/${FILE}
fi
@@
-101,14
+108,14
@@
cleanExit ()
}
# Get SDK installer
}
# Get SDK installer
-if [ ! -f
${SDK_FILE}
]; then
+if [ ! -f
"${SDK_FILE}"
]; then
do_cleanup=true
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
fi
# Retreive default install dir to extract version
-offset=$(grep -na -m1 "^MARKER:$"
$FILE
| cut -d':' -f1)
-eval $(head -n $offset
$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; }
VERSION=$(basename $DEFAULT_INSTALL_DIR)
[ "$PROFILE" = "" ] && { echo "PROFILE is not set"; exit 1; }