diff options
| author | tnut <tnut at nutyx dot com> | 2011-06-05 21:54:29 +0200 |
|---|---|---|
| committer | tnut <tnut at nutyx dot com> | 2011-06-05 21:54:29 +0200 |
| commit | c3d92dca6ca37ca6598c4da8bc6af514f0b37f35 (patch) | |
| tree | 40d494e4e9bcf4d7f3ae458cc32508e64162ff74 | |
| parent | 7d75d7e8ad458f885c2cfce95c2c75587636fecc (diff) | |
| parent | 1168736ded0885c6a623dce2789706bebcf23066 (diff) | |
| download | nutyx-pakxe-c3d92dca6ca37ca6598c4da8bc6af514f0b37f35.tar.gz nutyx-pakxe-c3d92dca6ca37ca6598c4da8bc6af514f0b37f35.tar.bz2 nutyx-pakxe-c3d92dca6ca37ca6598c4da8bc6af514f0b37f35.tar.xz nutyx-pakxe-c3d92dca6ca37ca6598c4da8bc6af514f0b37f35.zip | |
Merge branch 'master' of ssh://192.168.2.254:443/~/pakxe
| -rw-r--r-- | base/pkg-get/.md5sum.i686 | 2 | ||||
| -rw-r--r-- | base/pkg-get/.md5sum.x86_64 | 2 | ||||
| -rwxr-xr-x | base/pkg-get/pkg-get.awk | 21 |
3 files changed, 13 insertions, 12 deletions
diff --git a/base/pkg-get/.md5sum.i686 b/base/pkg-get/.md5sum.i686 index 0d49d2927..fe0fbe660 100644 --- a/base/pkg-get/.md5sum.i686 +++ b/base/pkg-get/.md5sum.i686 @@ -1,4 +1,4 @@ 3e833be041e5cb66c747c1d6b9a6258b pkg-get-awk.conf -9715fe2efcfe43ff294060f596618a3a pkg-get.awk +343d94379f58c8cab988131b213cdd02 pkg-get.awk bf4713f8f6976dd4d2d860fe6b4b03d0 pkg-get.po 4d89f89107b269e1579a7e4a440eddb1 syn diff --git a/base/pkg-get/.md5sum.x86_64 b/base/pkg-get/.md5sum.x86_64 index 0d49d2927..fe0fbe660 100644 --- a/base/pkg-get/.md5sum.x86_64 +++ b/base/pkg-get/.md5sum.x86_64 @@ -1,4 +1,4 @@ 3e833be041e5cb66c747c1d6b9a6258b pkg-get-awk.conf -9715fe2efcfe43ff294060f596618a3a pkg-get.awk +343d94379f58c8cab988131b213cdd02 pkg-get.awk bf4713f8f6976dd4d2d860fe6b4b03d0 pkg-get.po 4d89f89107b269e1579a7e4a440eddb1 syn diff --git a/base/pkg-get/pkg-get.awk b/base/pkg-get/pkg-get.awk index 1d0d4bb38..fd36a6aa2 100755 --- a/base/pkg-get/pkg-get.awk +++ b/base/pkg-get/pkg-get.awk @@ -13,8 +13,8 @@ function configs( a, i, k, n, old_FS) { n=split(ENVIRON["_"],a,"/") NPKG = a[n] - VERSION = "0.3.3" - DATE = "2011-04-03" + VERSION = "0.3.4" + DATE = "2011-06-05" # defauts CONF = "/etc/pkg-get.conf" @@ -27,6 +27,7 @@ function configs( a, i, k, n, old_FS) load_NUTYX_VERSION() "uname -p " | getline ENV; close("uname -p") WEBDIR[0] = "http://nutyx.meticul.eu/" NUTYX_VERSION "/" ENV "/release/" + TIMEOUT = 30 # arguments OPER=(ARGC>1) ? ARGV[1] : "" @@ -129,7 +130,7 @@ function dependent( a, i, n) { load_RDEPS() load_DB() - n=split(tb_RDEPS[PKG],a,",") + n=split(tb_RDEPS[tb_PKG[1]],a,",") for (i=1; i<=n; i++) if ((a[i] in tb_DB) || ("--all" in tb_OPT)) print a[i] @@ -237,7 +238,7 @@ function download(pak, a, WEBREPO, fnPak, cmd, rc, pakw) if ((getline < fnPak) <=0) { pakw = pak sub("#", "%23", pakw) - cmd="wget --no-directories --tries=3 --waitretry=3 -nv --directory-prefix="tb_PKGDIR[a[1]] " " WEBREPO pakw " >/dev/null 2>&1" + cmd="wget --no-directories --tries=3 --waitretry=3 -nv --connect-timeout=" TIMEOUT " --directory-prefix="tb_PKGDIR[a[1]] " " WEBREPO pakw " >/dev/null 2>&1" if ("--dry" in tb_OPT) { print " " cmd return 8 @@ -726,15 +727,15 @@ function sync( cmd, i, j, pak, rc) for (j=0; j<NPKGDIR; j++) { if (WEBDIR[j] > "") { for (i=1; i<=4; i++) { - cmd="wget -q -O "PKGDIR[j] pak[i] " " WEBDIR[j] pak[i] + cmd="wget -q --connect-timeout=" TIMEOUT " -O "PKGDIR[j] pak[i] " " WEBDIR[j] pak[i] if ("--dry" in tb_OPT) { print "\033[1;34m" cmd "\033[1;0m" } else { - rc=system(cmd) - if (rc>0) { - print "ERREUR", rc - exit 1 - } + rc=system(cmd) + if (rc>0) { + print "ERREUR", rc + exit 1 + } } } } |