pkg-get, remplacé par pkg-get-awk

15 files changed, 57 insertions, 158 deletions

diff --git a/base/pkg-get-awk/.footprint.i686 b/base/pkg-get-awk/.footprint.i686
deleted file mode 100644
index 9dd0582f4..000000000
--- a/base/pkg-get-awk/.footprint.i686
+++ /dev/null
@@ -1,13 +0,0 @@
-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/
-drwxr-xr-x	root/root	usr/share/locale/
-drwxr-xr-x	root/root	usr/share/locale/en/
-drwxr-xr-x	root/root	usr/share/locale/en/LC_MESSAGES/
--rw-r--r--	root/root	usr/share/locale/en/LC_MESSAGES/pkg-get.mo
diff --git a/base/pkg-get-awk/.footprint.x86_64 b/base/pkg-get-awk/.footprint.x86_64
deleted file mode 100644
index 9dd0582f4..000000000
--- a/base/pkg-get-awk/.footprint.x86_64
+++ /dev/null
@@ -1,13 +0,0 @@
-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/
-drwxr-xr-x	root/root	usr/share/locale/
-drwxr-xr-x	root/root	usr/share/locale/en/
-drwxr-xr-x	root/root	usr/share/locale/en/LC_MESSAGES/
--rw-r--r--	root/root	usr/share/locale/en/LC_MESSAGES/pkg-get.mo
diff --git a/base/pkg-get-awk/.md5sum.i686 b/base/pkg-get-awk/.md5sum.i686
deleted file mode 100644
index b86a7301c..000000000
--- a/base/pkg-get-awk/.md5sum.i686
+++ /dev/null
@@ -1,4 +0,0 @@
-3e833be041e5cb66c747c1d6b9a6258b  pkg-get-awk.conf
-342244762702ba95327867a4aba29a93  pkg-get.awk
-bf4713f8f6976dd4d2d860fe6b4b03d0  pkg-get.po
-4d89f89107b269e1579a7e4a440eddb1  syn
diff --git a/base/pkg-get-awk/.md5sum.x86_64 b/base/pkg-get-awk/.md5sum.x86_64
deleted file mode 100644
index b86a7301c..000000000
--- a/base/pkg-get-awk/.md5sum.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-3e833be041e5cb66c747c1d6b9a6258b  pkg-get-awk.conf
-342244762702ba95327867a4aba29a93  pkg-get.awk
-bf4713f8f6976dd4d2d860fe6b4b03d0  pkg-get.po
-4d89f89107b269e1579a7e4a440eddb1  syn
diff --git a/base/pkg-get-awk/Pkgfile b/base/pkg-get-awk/Pkgfile
deleted file mode 100644
index 7ef55d5c1..000000000
--- a/base/pkg-get-awk/Pkgfile
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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=3
-source=(syn pkg-get.awk pkg-get-awk.conf pkg-get.po)
-
-PKGMK_KEEP_LOCALES=yes
-
-build() {
-   msgfmt pkg-get.po -o pkg-get.mo
-   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
-   sed -i "s/uname-m/`uname -m`/g" $PKG/etc/pkg-get-awk.conf
-   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/syn b/base/pkg-get-awk/syn
deleted file mode 100644
index 95284d529..000000000
--- a/base/pkg-get-awk/syn
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-MediaDepot=/media/cdrom/depot
-Depot=/srv/NuTyX
-find_cd() {
-EXPECT_LABEL="nutyxcd"
-let PKGNB=0
-for SYS in /sys/block/sd* /sys/block/sr* ; do
-        if [ ! -d "$SYS" ]; then  continue; fi
-        DEV=/dev/${SYS##*/}
-        LABEL=`dd if=$DEV bs=1 skip=32808 count=32 2>/dev/null`
-        if [ $LABEL == $EXPECT_LABEL ]  2>/dev/null ; then
-                mkdir -p /media/cdrom 2>/dev/null
-		mount $DEV /media/cdrom
-		if [ ! -d /media/cdrom/depot ]; then
-			umount -n /media/cdrom
-		fi
-                break
-        fi
-done
-}
-if [ ! "$EUID" -eq 0 ]; then
-	echo "Seul le compte root peut synchroniser les ports NuTyX"
-	exit 1
-fi
-if ! mountpoint /media/cdrom > /dev/null; then
-	find_cd
-fi
-for i in `cat /etc/pkg-get.conf |grep -v ^#|grep http|cut -d "|" -f 1|cut -d" " -f2|cut -d"/" -f4`
-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`
-do
-	if [ -d $MediaDepot/$i ]; then
-		rm -r $Depot/$i > /dev/null 2>&1
-		mkdir -p $Depot/$i
-		for j in $MediaDepot/$i/*.xz 
-		do
-			let PKGNB=$PKGNB+1
-			fj=`basename $j`
-			ln -sf $MediaDepot/$i/$fj $Depot/$i/$fj
-			echo -n -e "$PKGNB Paquets trouvés sur le média\r"
-		done
-		echo "$PKGNB Paquets trouvés sur le média"
-		cp $MediaDepot/$i/PKG* $Depot/$i/
-	fi
-done
diff --git a/base/pkg-get/.footprint.i686 b/base/pkg-get/.footprint.i686
index 60666b99f..9dd0582f4 100644
--- a/base/pkg-get/.footprint.i686
+++ b/base/pkg-get/.footprint.i686
@@ -1,9 +1,13 @@
 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/
--rwxr-xr-x	root/root	usr/bin/pkg-repgen
+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/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man8/
--rw-r--r--	root/root	usr/share/man/man8/pkg-get.8.gz
--rw-r--r--	root/root	usr/share/man/man8/pkg-repgen.8.gz
+drwxr-xr-x	root/root	usr/share/locale/
+drwxr-xr-x	root/root	usr/share/locale/en/
+drwxr-xr-x	root/root	usr/share/locale/en/LC_MESSAGES/
+-rw-r--r--	root/root	usr/share/locale/en/LC_MESSAGES/pkg-get.mo
diff --git a/base/pkg-get/.footprint.x86_64 b/base/pkg-get/.footprint.x86_64
index 60666b99f..9dd0582f4 100644
--- a/base/pkg-get/.footprint.x86_64
+++ b/base/pkg-get/.footprint.x86_64
@@ -1,9 +1,13 @@
 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/
--rwxr-xr-x	root/root	usr/bin/pkg-repgen
+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/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man8/
--rw-r--r--	root/root	usr/share/man/man8/pkg-get.8.gz
--rw-r--r--	root/root	usr/share/man/man8/pkg-repgen.8.gz
+drwxr-xr-x	root/root	usr/share/locale/
+drwxr-xr-x	root/root	usr/share/locale/en/
+drwxr-xr-x	root/root	usr/share/locale/en/LC_MESSAGES/
+-rw-r--r--	root/root	usr/share/locale/en/LC_MESSAGES/pkg-get.mo
diff --git a/base/pkg-get/.md5sum.i686 b/base/pkg-get/.md5sum.i686
index 94160a452..b86a7301c 100644
--- a/base/pkg-get/.md5sum.i686
+++ b/base/pkg-get/.md5sum.i686
@@ -1 +1,4 @@
-4255529e512555b8759dc939305b708c  pkg-get-0.5.2.tar.gz
+3e833be041e5cb66c747c1d6b9a6258b  pkg-get-awk.conf
+342244762702ba95327867a4aba29a93  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 94160a452..b86a7301c 100644
--- a/base/pkg-get/.md5sum.x86_64
+++ b/base/pkg-get/.md5sum.x86_64
@@ -1 +1,4 @@
-4255529e512555b8759dc939305b708c  pkg-get-0.5.2.tar.gz
+3e833be041e5cb66c747c1d6b9a6258b  pkg-get-awk.conf
+342244762702ba95327867a4aba29a93  pkg-get.awk
+bf4713f8f6976dd4d2d860fe6b4b03d0  pkg-get.po
+4d89f89107b269e1579a7e4a440eddb1  syn
diff --git a/base/pkg-get/Pkgfile b/base/pkg-get/Pkgfile
index 204985eb1..35be7e055 100644
--- a/base/pkg-get/Pkgfile
+++ b/base/pkg-get/Pkgfile
@@ -1,23 +1,25 @@
-# Description: Outil de gestion de paquets binaires pour NuTyX
-# URL: http://www.varlock.com et nutyx.org
-# Maintainer: thierryn1 at hispeed dot ch
-# Packager: thierryn1 at hispeed dot ch
+# 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
-version=0.5.2
-release=2
-source=(http://nutyx.meticul.eu/files/$name-$version.tar.gz)
+version=0.3.2
+release=3
+source=(syn pkg-get.awk pkg-get-awk.conf pkg-get.po)
+
+PKGMK_KEEP_LOCALES=yes
 
 build() {
-ARCH_=`uname -m`
-	cd $name-$version
-	make PREFIX=$PKG/usr CFGDIR=$PKG/etc install
-	mkdir -p $PKG/usr/share
-	mv $PKG/usr/{man,share/man}
-	rm $PKG/etc/pkg-get.conf
-	rm $PKG/usr/bin/pkg-get
-	if [ "$ARCH_" == "x86_64" ]; then 
-		sed -i "s/i686/x86_64/" $PKG/usr/bin/pkg-repgen
-	fi
+   msgfmt pkg-get.po -o pkg-get.mo
+   mkdir -p $PKG/usr/bin
+   install -m 755 pkg-get.awk $PKG/usr/bin
+   install -m 755 syn $PKG/usr/bin/syn
+   ln -s pkg-get.awk $PKG/usr/bin/pkg-get
+   mkdir -p $PKG/etc
+   install -m 664 pkg-get-awk.conf $PKG/etc
+   sed -i "s/uname-m/`uname -m`/g" $PKG/etc/pkg-get-awk.conf
+   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.conf b/base/pkg-get/pkg-get-awk.conf
index 82e53979b..82e53979b 100644
--- a/base/pkg-get-awk/pkg-get-awk.conf
+++ b/base/pkg-get/pkg-get-awk.conf
diff --git a/base/pkg-get-awk/pkg-get.awk b/base/pkg-get/pkg-get.awk
index d8e526a80..d8e526a80 100755
--- a/base/pkg-get-awk/pkg-get.awk
+++ b/base/pkg-get/pkg-get.awk
diff --git a/base/pkg-get-awk/pkg-get.po b/base/pkg-get/pkg-get.po
index d0d83732c..d0d83732c 100644
--- a/base/pkg-get-awk/pkg-get.po
+++ b/base/pkg-get/pkg-get.po
diff --git a/base/pkg-get/syn b/base/pkg-get/syn
index d29fcd6f7..95284d529 100644
--- a/base/pkg-get/syn
+++ b/base/pkg-get/syn
@@ -25,23 +25,22 @@ fi
 if ! mountpoint /media/cdrom > /dev/null; then
 	find_cd
 fi
-if [ ! -L /depot ]; then
-	for i in `cat /etc/pkg-get.conf |grep -v ^#|grep http|cut -d "|" -f 1|cut -d" " -f2|cut -d"/" -f4`
-	do
-		if [ -a $Depot/$i ]; then
-			rm -r $Depot/$i
-		fi
-	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`
-	do
+for i in `cat /etc/pkg-get.conf |grep -v ^#|grep http|cut -d "|" -f 1|cut -d" " -f2|cut -d"/" -f4`
+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`
+do
 	if [ -d $MediaDepot/$i ]; then
 		rm -r $Depot/$i > /dev/null 2>&1
 		mkdir -p $Depot/$i
 		for j in $MediaDepot/$i/*.xz 
 		do
 			let PKGNB=$PKGNB+1
-			
 			fj=`basename $j`
 			ln -sf $MediaDepot/$i/$fj $Depot/$i/$fj
 			echo -n -e "$PKGNB Paquets trouvés sur le média\r"
@@ -49,10 +48,4 @@ if [ ! -L /depot ]; then
 		echo "$PKGNB Paquets trouvés sur le média"
 		cp $MediaDepot/$i/PKG* $Depot/$i/
 	fi
-	done
-else
-	for i in `cat /etc/pkg-get.conf |grep -v ^#|grep http|cut -d "|" -f 1|cut -d" " -f2|cut -d"/" -f4`
-	do
-		rsync -avuz --delete-before rsync://nutyx.meticul.eu/nutyx/attapu/i686/$i/ $Depot/$i/
-	done
-fi	
+done