summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2011-02-06 18:33:24 +0100
committertnut <thierryn1 at hispeed dot ch>2011-02-06 18:33:24 +0100
commite93f7441c3c63340e47e0354591894dbc44a4a59 (patch)
treee01d224bee7d5fb1b085754ab10badec2efb5854
parent03d5570085a2e57c1a353f9e2c07995999298c22 (diff)
downloadnutyx-pakxe-e93f7441c3c63340e47e0354591894dbc44a4a59.tar.gz
nutyx-pakxe-e93f7441c3c63340e47e0354591894dbc44a4a59.tar.bz2
nutyx-pakxe-e93f7441c3c63340e47e0354591894dbc44a4a59.tar.xz
nutyx-pakxe-e93f7441c3c63340e47e0354591894dbc44a4a59.zip
pkg-get-awk, maj 0.3.1-1
-rw-r--r--base/pkg-get-awk/.footprint.x86_642
-rw-r--r--base/pkg-get-awk/.md5sum.i6864
-rw-r--r--base/pkg-get-awk/.md5sum.x86_644
-rw-r--r--base/pkg-get-awk/Pkgfile6
-rwxr-xr-xbase/pkg-get-awk/pkg-get.awk39
-rw-r--r--base/pkg-get-awk/syn1
6 files changed, 38 insertions, 18 deletions
diff --git a/base/pkg-get-awk/.footprint.x86_64 b/base/pkg-get-awk/.footprint.x86_64
index 5e4a825b5..9dd0582f4 100644
--- a/base/pkg-get-awk/.footprint.x86_64
+++ b/base/pkg-get-awk/.footprint.x86_64
@@ -1,7 +1,9 @@
drwxr-xr-x root/root etc/
-rw-rw-r-- root/root etc/pkg-get-awk.conf
+lrwxrwxrwx root/root etc/pkg-get.conf -> pkg-get-awk.conf
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
+lrwxrwxrwx root/root usr/bin/pkg-get -> pkg-get.awk
-rwxr-xr-x root/root usr/bin/pkg-get.awk
-rwxr-xr-x root/root usr/bin/syn.awk
drwxr-xr-x root/root usr/share/
diff --git a/base/pkg-get-awk/.md5sum.i686 b/base/pkg-get-awk/.md5sum.i686
index a38f7b77d..4da96fe82 100644
--- a/base/pkg-get-awk/.md5sum.i686
+++ b/base/pkg-get-awk/.md5sum.i686
@@ -1,4 +1,4 @@
3e833be041e5cb66c747c1d6b9a6258b pkg-get-awk.conf
-0b86cf36a21f3e69fa571c055151d50d pkg-get.awk
+27ff341563cbf8c438752c535ab5fd19 pkg-get.awk
d3457c0e21dc92ee3b86ed3a0d5e094e pkg-get.po
-afe269237467ab0650b043b933ba993a syn
+4d89f89107b269e1579a7e4a440eddb1 syn
diff --git a/base/pkg-get-awk/.md5sum.x86_64 b/base/pkg-get-awk/.md5sum.x86_64
index a38f7b77d..4da96fe82 100644
--- a/base/pkg-get-awk/.md5sum.x86_64
+++ b/base/pkg-get-awk/.md5sum.x86_64
@@ -1,4 +1,4 @@
3e833be041e5cb66c747c1d6b9a6258b pkg-get-awk.conf
-0b86cf36a21f3e69fa571c055151d50d pkg-get.awk
+27ff341563cbf8c438752c535ab5fd19 pkg-get.awk
d3457c0e21dc92ee3b86ed3a0d5e094e pkg-get.po
-afe269237467ab0650b043b933ba993a syn
+4d89f89107b269e1579a7e4a440eddb1 syn
diff --git a/base/pkg-get-awk/Pkgfile b/base/pkg-get-awk/Pkgfile
index 4948d502b..25cacd217 100644
--- a/base/pkg-get-awk/Pkgfile
+++ b/base/pkg-get-awk/Pkgfile
@@ -6,7 +6,7 @@
name=pkg-get-awk
version=0.3.1
-release=3
+release=4
source=(syn pkg-get.awk pkg-get-awk.conf pkg-get.po)
PKGMK_KEEP_LOCALES=yes
@@ -16,8 +16,10 @@ build() {
mkdir -p $PKG/usr/bin
install -m 755 pkg-get.awk $PKG/usr/bin
install -m 755 syn $PKG/usr/bin/syn.awk
+ ln -s pkg-get.awk $PKG/usr/bin/pkg-get
mkdir -p $PKG/etc
- install -m 664 pkg-get-awk.conf $PKG/etc
+ install -m 664 pkg-get-awk.conf $PKG/etc
+ ln -s pkg-get-awk.conf $PKG/etc/pkg-get.conf
mkdir -p $PKG/usr/share/locale/en/LC_MESSAGES
install -m 644 pkg-get.mo $PKG/usr/share/locale/en/LC_MESSAGES
}
diff --git a/base/pkg-get-awk/pkg-get.awk b/base/pkg-get-awk/pkg-get.awk
index 5478a7a0e..f7574c0b2 100755
--- a/base/pkg-get-awk/pkg-get.awk
+++ b/base/pkg-get-awk/pkg-get.awk
@@ -172,7 +172,11 @@ function depinst( i)
load_DEPS()
load_REPO()
for (i=1; i<=nPKG; i++) {
- depinst2(tb_PKG[i])
+ if (tb_PKG[i] in tb_DB) {
+ print _"Le paquet" " " tb_PKG[i] " " _"est déjà installé"
+
+ }
+ else depinst2(tb_PKG[i])
}
return rc
}
@@ -222,7 +226,7 @@ function download(pak, a, cmd, j, pakw, rep, WEBREPO)
if (rep=="y") {
pakw = pak
sub("#", "%23", pakw)
- cmd="wget --no-directories --tries=3 --waitretry=3 "tb_PKGDIR[a[1]] pak " " WEBREPO pakw
+ cmd="wget --no-directories --tries=3 --waitretry=3 -O "tb_PKGDIR[a[1]] pak " " WEBREPO pakw
if ("--dry" in tb_OPT) {
print "\033[1;34m" cmd "\033[1;0m"
} else {
@@ -326,9 +330,14 @@ function info( a, b, c, cmd, g, gline, n, rline, out)
function install( i)
{
verif_if_root()
+ load_DB()
load_REPO()
for (i=1; i<=nPKG; i++) {
- install2(tb_PKG[i], " ")
+ if (tb_PKG[i] in tb_DB) {
+ print _"Le paquet" " " tb_PKG[i] " " _"est déjà installé"
+
+ }
+ else install2(tb_PKG[i], " ")
}
}
@@ -341,15 +350,20 @@ function install2(Pkg, Oper, cmd, i, pak)
}
if ("-do" in tb_OPT)
return
-
- if (PRE=="y" && tb_PRE[Pkg]=="yes") { # pre-install
- cmd = "/bin/bash " tb_PKGDIR[Pkg] "/PKGINST " Pkg "_pre_install"
- if ("--dry" in tb_OPT) {
- print "\033[1;33m" cmd "\033[1;0m"
- } else {
- while ((cmd | getline) >0)
- print
- close(cmd)
+ load_DB()
+ if (Pkg in tb_DB) {
+ return
+ }
+ else {
+ print _"Installation de" " " Pkg
+ if (PRE=="y" && tb_PRE[Pkg]=="yes") { # pre-install
+ cmd = "/bin/bash " tb_PKGDIR[Pkg] "/PKGINST " Pkg "_pre_install"
+ if ("--dry" in tb_OPT) {
+ print "\033[1;33m" cmd "\033[1;0m"
+ } else {
+ while ((cmd | getline) >0)
+ print
+ close(cmd)
}
}
cmd = "pkgadd " AARGS " " Oper " " tb_PKGDIR[Pkg] pak # Oper==" " : insert ; Oper=="-u" : update
@@ -370,6 +384,7 @@ function install2(Pkg, Oper, cmd, i, pak)
close(cmd)
}
}
+ }
}
diff --git a/base/pkg-get-awk/syn b/base/pkg-get-awk/syn
index 394d09845..95284d529 100644
--- a/base/pkg-get-awk/syn
+++ b/base/pkg-get-awk/syn
@@ -30,6 +30,7 @@ do
if [ -a $Depot/$i ]; then
rm -r $Depot/$i
fi
+ mkdir -p $Depot/$i
done
pkg-get sync
for i in `cat /etc/pkg-get.conf |grep -v ^#|grep http|cut -d "|" -f 1|cut -d" " -f2|cut -d"/" -f4`