diff options
author | Liping Ke <liping.ke@intel.com> | 2011-03-02 01:24:22 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-03-01 07:35:58 -0800 |
commit | cad40f4fa980672fa7cae9e8db1274bcee367acf (patch) | |
tree | efd8b94ee6745ac14d90e695cedce40f42205a8a /meta/recipes-devtools/installer/adt-installer/adt_installer | |
parent | f3a482b47678819b4a91bb58810c7bc6ef9e6f3e (diff) | |
download | poky-cad40f4fa980672fa7cae9e8db1274bcee367acf.tar.gz |
ADT: Fix several bugs for adt installer
Two bugs are found
1) image download file path is not correct. So even if file is downloaded
already, it can't be detected.
2) several images now are renamed, such as sato-dev, sato-sdk, we need to change the name
accordingly.
Signed-off-by: Liping Ke <liping.ke@intel.com>
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/adt_installer')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/adt_installer | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer index 1f481ded61..cca576f7ef 100755 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer | |||
@@ -216,17 +216,18 @@ done | |||
216 | 216 | ||
217 | download_file() | 217 | download_file() |
218 | { | 218 | { |
219 | if [ -f "$LOCAL_DOWNLOAD/$1" ]; then | 219 | local filename=`echo ${1##*/}` |
220 | confirm_download $1 | 220 | if [ -f "$LOCAL_DOWNLOAD/$filename" ]; then |
221 | confirm_download $filename | ||
221 | result="$?" | 222 | result="$?" |
222 | if [ ! "$result" == "0" ]; then | 223 | if [ ! "$result" == "0" ]; then |
223 | return | 224 | return |
224 | else | 225 | else |
225 | echo "Removing old file [$1]" | 226 | echo "Removing old file [$1]" |
226 | rm -rf "$LOCAL_DOWNLOAD/$1" | 227 | rm -rf "$LOCAL_DOWNLOAD/$filename" |
227 | fi | 228 | fi |
228 | fi | 229 | fi |
229 | echo_info "Downloading file: $1..." | 230 | echo_info "Downloading file: $filename..." |
230 | wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE" | 231 | wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE" |
231 | } | 232 | } |
232 | 233 | ||