@@ -378,11 +378,17 @@ function apt-get.update(){
378
378
379
379
cat Packages.gz | gunzip -c | grep -E " ^Package:|^Filename:|^Depends:|^Version:" >> cache.txt || true
380
380
381
+ echo APT_GET_UPDATE
381
382
while read line; do
382
383
local line=$( echo " ${line} " | sed ' s|[[:space:]]| |g' )
383
384
local repo_info=($( echo ${line} | tr " " " \n" ) )
384
385
local base_url=${repo_info[1]}
385
386
local dist_name=${repo_info[2]}
387
+
388
+ echo line=${line}
389
+ echo repo_info=${repo_info}
390
+ echo base_url=${base_url}
391
+ echo dist_name=${dist_name}
386
392
387
393
# Detect openSUSE Build Service (OBS) repositories, which are listed using a single / at the end (according to pkg2appimage documentation)
388
394
if test " ${dist_name} " = " /" ; then
@@ -404,21 +410,36 @@ function apt-get.do-download(){
404
410
grep -q ^" Package: ${1} " $ status && return
405
411
}
406
412
407
- echo " ${already_downloaded_package[@]} " | sed ' s| |\n|g' | grep -q ^" ${1} " $ && return
413
+ local package_name=$( echo ${1} | cut -d= -f1)
414
+ local package_version=` echo ${1} | cut -s -d= -f2-`
415
+
416
+ echo " ${already_downloaded_package[@]} " | sed ' s| |\n|g' | grep -q ^" ${package_name} " $ && return
408
417
409
- already_downloaded_package+=(${1} )
418
+ if ! test -z " ${package_version} " ; then
419
+ local package_url=` cat cache.txt | grep -v ^" Depends: " \
420
+ | grep -A 3 ^" Package: ${package_name} " $ \
421
+ | grep -A 2 ^" Version: ${package_version} " \
422
+ | grep ^" Filename: " \
423
+ | cut -c 11-`
424
+ else
425
+ local package_url=` cat cache.txt | grep -v ^" Depends: " \
426
+ | grep -A 3 -m 1 ^" Package: ${package_name} " $ \
427
+ | grep ^" Filename: " \
428
+ | cut -c 11-`
429
+ fi
430
+
431
+ already_downloaded_package+=(${package_name} )
410
432
411
- local dependencies=($( cat cache.txt | grep -A 2 -m 1 ^" Package: ${1 } " $ \
433
+ local dependencies=($( cat cache.txt | grep -A 2 -m 1 ^" Package: ${package_name } " $ \
412
434
| grep ^" Depends: " \
413
435
| cut -c 9- \
414
436
| sed " s|([^)]*)||g;s|[[:space:]]||g" \
415
437
| sed " s|,|\n|g" \
416
438
| cut -d" |" -f1 ) )
417
439
418
- local package_url=$( cat cache.txt | grep -A 3 -m 1 ^" Package: ${1} " $ \
419
- | grep ^" Filename: " \
420
- | cut -c 11-)
421
-
440
+ echo PACKAGE NAME: ${package_name}
441
+ echo PACKAGE_VERSION: ${package_version}
442
+ echo PACKAGE_URL: ${package_url}
422
443
423
444
[ ! -f " ${package_url} " ] && {
424
445
[ ! " ${package_url} " = " " ] && {
0 commit comments