Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

2 files changed, 13 insertions, 7 deletions

diff --git a/base/pkg-get-awk/Pkgfile b/base/pkg-get-awk/Pkgfile
index d47a1b130..39b939a38 100644
--- a/base/pkg-get-awk/Pkgfile
+++ b/base/pkg-get-awk/Pkgfile
@@ -1,11 +1,11 @@
-# Description: Un gestionnaire de paquets binaire pour NuTyX léger et rapide
+# Description: Un gestionnaire de paquets binaires pour NuTyX léger et rapide
 # URL: http://www.nutyx.org
 # Maintainer: NuTyX core team
 # Packager: guy_
 
 name=pkg-get-awk
 version=0.3.2
-release=1
+release=2
 source=(syn pkg-get.awk pkg-get-awk.conf pkg-get.po)
 
 PKGMK_KEEP_LOCALES=yes
diff --git a/base/pkg-get-awk/pkg-get.awk b/base/pkg-get-awk/pkg-get.awk
index 7206dfc55..4cb30ce2a 100755
--- a/base/pkg-get-awk/pkg-get.awk
+++ b/base/pkg-get-awk/pkg-get.awk
@@ -14,7 +14,7 @@ function configs(   a, i, k, n, old_FS)
    n=split(ENVIRON["_"],a,"/")
    NPKG       = a[n]
    VERSION    = "0.3.2"
-   DATE       = "2011-03-06"
+   DATE       = "2011-03-10"
 
    # defauts
    CONF       = "/etc/pkg-get.conf"
@@ -185,7 +185,6 @@ function depinst(   i)
 
 function depinst2(Pkg,    a, i, n)
 {
-# print "=== depinst2 " Pkg
    n=split(tb_DEPS[Pkg],a,",")
    for (i=1; i<=n; i++) {
       if (tb_DEP_TRT[a[i]]==0) {
@@ -193,13 +192,11 @@ function depinst2(Pkg,    a, i, n)
          if (a[i] in tb_DEPS)
             depinst2(a[i])
          if (!(a[i] in tb_DB)) {
-# print "=== install2_update2 F: " a[i]
             install2_update2(a[i], "")
          }
       }
    }
    if (!(Pkg in tb_DB)) {
-# print "=== install2_update2 Z: " Pkg
       install2_update2(Pkg, "")
    }
 }
@@ -358,6 +355,12 @@ function install(   i)
 
 function install2_update2(Pkg, Oper,   cmd, i, pak)
 {
+###
+   if (!(Pkg in tb_REPO)) {
+      print "\033[1;31m" _"Paquet" " " Pkg " " _"indisponible" "\033[1;0m"
+      return
+   }
+###
    if (tb_REPO[Pkg] != "" ) {
       pak=Pkg"#"tb_REPO[Pkg] ".pkg.tar.xz"
       download(pak)
@@ -386,6 +389,9 @@ function install2_update2(Pkg, Oper,   cmd, i, pak)
          print
       close(cmd)
    } 
+###
+   tb_DB[Pkg]=tb_REPO[Pkg]
+###
    if (POST=="y" && tb_POST[Pkg]=="yes") {                   # post-install
       cmd = "/bin/bash " tb_PKGDIR[Pkg] "/PKGINST " Pkg "_post_install"
       if ("--dry" in tb_OPT) {
@@ -751,7 +757,7 @@ function update(   i)
    load_REPO()
    load_DB() ##
    for (i=1; i<=nPKG; i++) {
-      if (!(tb_PKG[i] in tb_LOCK)) {
+      if (!(tb_PKG[i] in tb_LOCK) && !(tb_PKG[i] in tb_DB)) {
          print _"paquet à mettre à jour:" " " tb_PKG[i]
          install2_update2(tb_PKG[i], "-u")
       }