# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1488112662 -3600
# Node ID 90e556840716cdb480476e626973727f4dac9f03
# Parent  2f6240aa30fd27281e5ad2f945775aea75903e39
Back to 'receip' so sup and tazpkg package are same but different (sup is much more simple) and yes, this time we use: receip

diff -r 2f6240aa30fd -r 90e556840716 libsup.sh
--- a/libsup.sh	Sun Feb 26 10:04:31 2017 +0000
+++ b/libsup.sh	Sun Feb 26 13:37:42 2017 +0100
@@ -56,9 +56,9 @@
 	rm -rf ${cache} && mkdir ${cache} 
 	cp ${supfile} ${cache} && cd ${cache}
 	
-	# Get receipt for deps
-	cpio -i receipt --quiet < ${supfile}
-	. receipt
+	# Get receip for deps
+	cpio -i receip --quiet < ${supfile}
+	. receip
 	
 	# Install sup deps || exit on missing system deps ?
 	newline
@@ -80,13 +80,13 @@
 	log "$(gettext 'Installing package:') $pkg"
 	separator
 	
-	# Extract and source receipt first to check deps
+	# Extract and source receip first to check deps
 	extract_sup "$supfile"
 	
 	# Execute sup_install() in files/ tree so packages maintainers just
 	# have to dl and move files where they were in $HOME
 	cd files
-	if grep -q "^sup_install" ../receipt; then
+	if grep -q "^sup_install" ../receip; then
 		gettext "Executing install function:"; colorize 33 " sup_install"
 		sup_install
 	fi
@@ -102,13 +102,13 @@
 	
 	# Back to pkg tree
 	cd ${cache}/${PACKAGE}-${VERSION}
-	echo "sup_size=\"$(du -sh files | cut -d "	" -f 1)\"" >> receipt
+	echo "sup_size=\"$(du -sh files | cut -d "	" -f 1)\"" >> receip
 	
 	# Now we need a place to store package data and set $sup_size
 	gettext "Installing files to $HOME..."
 	data="${installed}/${PACKAGE}"
 	mkdir -p ${data}
-	for file in receipt README files.list; do
+	for file in receip README files.list; do
 		[ -f "$file" ] && cp -f ${file} ${data}
 	done
 	for file in $(ls -A files); do
diff -r 2f6240aa30fd -r 90e556840716 server/sup/sup.cgi
--- a/server/sup/sup.cgi	Sun Feb 26 10:04:31 2017 +0000
+++ b/server/sup/sup.cgi	Sun Feb 26 13:37:42 2017 +0100
@@ -30,12 +30,12 @@
 	<a href='?sup=debug'>Sup debug</a>
 EOT
 		fi
-		#. ${wok}/${pkg}/receipt
+		#. ${wok}/${pkg}/receip
 		cat << EOT
 </div>
 
 <pre>
-$(cat ${wok}/${pkg}/receipt )
+$(cat ${wok}/${pkg}/receip )
 </pre>
 EOT
 		
diff -r 2f6240aa30fd -r 90e556840716 server/sup/sup.conf
--- a/server/sup/sup.conf	Sun Feb 26 10:04:31 2017 +0000
+++ b/server/sup/sup.conf	Sun Feb 26 13:37:42 2017 +0100
@@ -5,8 +5,8 @@
 MAINTAINER="devel@slitaz.org"
 
 # Authenticated users
-PLUGINS_TOOLS="${PLUGINS_TOOLS} <a href="?sup">Sup hub</a>"
-DASHBOARD_TOOLS="${DASHBOARD_TOOLS} <a href="?sup">Sup hub</a>"
+PLUGINS_TOOLS="${PLUGINS_TOOLS} <a href='?sup'>Sup hub</a>"
+DASHBOARD_TOOLS="${DASHBOARD_TOOLS} <a href='?sup'>Sup hub</a>"
 PROFILE_TOOLS="${PROFILE_TOOLS}"
 
 # Admin only in Dashboard
diff -r 2f6240aa30fd -r 90e556840716 sup
--- a/sup	Sun Feb 26 10:04:31 2017 +0000
+++ b/sup	Sun Feb 26 13:37:42 2017 +0100
@@ -56,7 +56,7 @@
 	-c|cook)
 		# Cook in $cache/cook amd mv pkg to a visible dir
 		pkg="$2"
-		receipt="$wok/$pkg/receipt"
+		receip="$wok/$pkg/receip"
 		cache="$cache/cook"
 		
 		# Handle --init
@@ -71,8 +71,8 @@
 			gettext "You must specify a package to cook:"
 			boldify " sup cook [package]" && exit 1
 		fi
-		if [ ! -f "$receipt" ]; then
-			gettext "Can't find receipt in wok for:"
+		if [ ! -f "$receip" ]; then
+			gettext "Can't find receip in wok for:"
 			colorize 31 " $pkg" && exit 1
 		fi
 		
@@ -81,12 +81,12 @@
 		separator
 		rm -rf ${cache} && mkdir -p ${cache} ${cooked}
 		
-		# Check receipt
-		[ "$verbose" ] && gettext "Checking receipt variables..."
-		. ${receipt}
+		# Check receip
+		[ "$verbose" ] && gettext "Checking receip variables..."
+		. ${receip}
 		for var in PACKAGE VERSION SHORT_DESC MAINTAINER LICENSE WEB_SITE
 		do
-			value="$(. $receipt; eval echo \$$var)"
+			value="$(. $receip; eval echo \$$var)"
 			case "$var" in
 				PACKAGE|VERSION|SHORT_DESC|MAINTAINER|LICENSE)
 					if [ ! "$value" ]; then
@@ -115,7 +115,7 @@
 		done
 		
 		# Add $build_date
-		echo "build_date=\"$(date "+%Y-%m-%d %H:%M")\"" >> ${receipt}
+		echo "build_date=\"$(date "+%Y-%m-%d %H:%M")\"" >> ${receip}
 		
 		gettext "Creating compressed archive..."
 		find files | cpio -o -H newc --quiet | lzma e files.lzma -si
@@ -125,7 +125,7 @@
 		
 		size="$(du -sh $cooked/$supfile | cut -d "	" -f 1)"
 		echo "$(gettext 'Packages:') $(colorize 33 $supfile) ($size)"
-		sed -i "/^build_date=/"d ${receipt}
+		sed -i "/^build_date=/"d ${receip}
 		rm -rf ${cache} && newline ;;
 	
 	-e|extract)
@@ -178,7 +178,7 @@
 		boldify " $installed_nb"
 		separator
 		for pkg in $(ls ${installed}); do
-			. ${wok}/${pkg}/receipt
+			. ${wok}/${pkg}/receip
 			echo "$pkg $(indent 26 $VERSION) $(indent 42 $MAINTAINER)"
 		done
 		if [ "$installed_nb" == 0 ]; then
@@ -190,7 +190,7 @@
 			boldify " $(ls ${wok} | wc -l)"
 			separator
 			for pkg in $(ls ${wok}); do
-				. ${wok}/${pkg}/receipt
+				. ${wok}/${pkg}/receip
 				echo "$pkg $(indent 26 $VERSION) $(indent 42 $MAINTAINER)"
 			done
 			newline 
@@ -201,8 +201,8 @@
 	*)
 		# Display pkg info if installed
 		pkg="$1"
-		if [ -f "$installed/$pkg/receipt" ]; then
-			. ${installed}/${pkg}/receipt
+		if [ -f "$installed/$pkg/receip" ]; then
+			. ${installed}/${pkg}/receip
 			newline
 			gettext "Installed package:"; colorize 32 " $PACKAGE $VERSION"
 			separator