# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1516788642 -7200
# Node ID 69af973613cda74e9d354a96548a0148ff8cf6d7
# Parent  88d62319f89e917bd17dc891752ce65efccd20c9
modules/get, modules/install: patch for the x86_64 support.

diff -r 88d62319f89e -r 69af973613cd modules/get
--- a/modules/get	Thu Jan 04 15:50:33 2018 +0200
+++ b/modules/get	Wed Jan 24 12:10:42 2018 +0200
@@ -428,16 +428,18 @@
 	[ -e "/etc/slitaz/cook.conf" ] && . /etc/slitaz/cook.conf
 
 	# Find local package
-	pkgfile="$(awk -F$'\t' -vpkg="$1" -vbase="$PKGS" '{
-		if ($1 == pkg) { printf("%s/%s-%s.tazpkg", base, $1, $2); exit; }
+	namever="$(awk -F$'\t' -vpkg="$1" '{
+		if ($1 == pkg) { printf("%s-%s", $1, $2); exit; }
 	}' $PKGS/packages.info)"
 
 	# Find local provided package
-	[ -n "$pkgfile" ] ||
-	pkgfile="$(awk -F$'\t' -vpkg="$1" -vbase="$PKGS" '{
-		if (index(" " $10 " ", " " pkg " ")) { printf("%s/%s-%s.tazpkg", base, $1, $2); exit; }
+	[ -n "$namever" ] ||
+	namever="$(awk -F$'\t' -vpkg="$1" '{
+		if (index(" " $10 " ", " " pkg " ")) { printf("%s-%s", $1, $2); exit; }
 	}' $PKGS/packages.info)"
 
+	[ -n "$namever" ] && pkgfile=$(find "$PKGS" -name "$namever*.tazpkg")
+
 	if [ -n "$pkgfile" -a -f "$pkgfile" ]; then
 		echo "$pkgfile"
 	else
diff -r 88d62319f89e -r 69af973613cd modules/install
--- a/modules/install	Thu Jan 04 15:50:33 2018 +0200
+++ b/modules/install	Wed Jan 24 12:10:42 2018 +0200
@@ -112,10 +112,10 @@
 	# Get the receipt's variable DEPENDS
 	DEPENDS=$(
 		TMP_DIR=$(mktemp -d); cd "$TMP_DIR"
-		cpio --quiet -i receipt >/dev/null 2>&1
+		cpio --quiet -i receipt < "$1" >/dev/null 2>&1
 		. ./receipt; echo $DEPENDS
 		rm -rf "$TMP_DIR"
-	) < "$1"
+	)
 
 	unset num missing_packages
 	for depend in $DEPENDS; do
@@ -332,7 +332,7 @@
 	TMP_DIR="$(mktemp -d)"
 
 	# Get receipt's variables and functions
-	{ cd "$TMP_DIR"; cpio --quiet -i receipt >/dev/null 2>&1; } < "$PACKAGE_FILE"
+	{ cd "$TMP_DIR"; cpio --quiet -i receipt < "$PACKAGE_FILE" >/dev/null 2>&1; }
 	# Why next code? "Bad" receipt sourcing can redefine some vital TazPkg variables.
 	(
 		. "$TMP_DIR/receipt"
@@ -663,10 +663,10 @@
 
 PACKAGE=$(
 	tmp_dir=$(mktemp -d); cd "$tmp_dir"
-	cpio --quiet -i receipt >/dev/null 2>&1
+	cpio --quiet -i receipt < "$1" >/dev/null 2>&1
 	. ./receipt; echo $PACKAGE
 	rm -rf "$tmp_dir"
-) < "$1"
+)
 
 if grep -qs "^$PACKAGE$" "$BLOCKED"; then
 	_ 'Package "%s" blocked.' "$PACKAGE"