# HG changeset patch # User Paul Issott # Date 1488103471 0 # Node ID 2f6240aa30fd27281e5ad2f945775aea75903e39 # Parent f10893862ba52b24d52ad9ac3245b3a82740ffcb Tiny edits (receip -> receipt) diff -r f10893862ba5 -r 2f6240aa30fd libsup.sh --- a/libsup.sh Fri Feb 24 20:19:15 2017 +0000 +++ b/libsup.sh Sun Feb 26 10:04:31 2017 +0000 @@ -56,9 +56,9 @@ rm -rf ${cache} && mkdir ${cache} cp ${supfile} ${cache} && cd ${cache} - # Get receip for deps - cpio -i receip --quiet < ${supfile} - . receip + # Get receipt for deps + cpio -i receipt --quiet < ${supfile} + . receipt # Install sup deps || exit on missing system deps ? newline @@ -80,13 +80,13 @@ log "$(gettext 'Installing package:') $pkg" separator - # Extract and source receip first to check deps + # Extract and source receipt 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" ../receip; then + if grep -q "^sup_install" ../receipt; 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)\"" >> receip + echo "sup_size=\"$(du -sh files | cut -d " " -f 1)\"" >> receipt # 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 receip README files.list; do + for file in receipt README files.list; do [ -f "$file" ] && cp -f ${file} ${data} done for file in $(ls -A files); do diff -r f10893862ba5 -r 2f6240aa30fd server/sup/sup.cgi --- a/server/sup/sup.cgi Fri Feb 24 20:19:15 2017 +0000 +++ b/server/sup/sup.cgi Sun Feb 26 10:04:31 2017 +0000 @@ -30,12 +30,12 @@ Sup debug EOT fi - #. ${wok}/${pkg}/receip + #. ${wok}/${pkg}/receipt cat << EOT
-$(cat ${wok}/${pkg}/receip )
+$(cat ${wok}/${pkg}/receipt )
 
EOT diff -r f10893862ba5 -r 2f6240aa30fd sup --- a/sup Fri Feb 24 20:19:15 2017 +0000 +++ b/sup Sun Feb 26 10:04:31 2017 +0000 @@ -56,7 +56,7 @@ -c|cook) # Cook in $cache/cook amd mv pkg to a visible dir pkg="$2" - receip="$wok/$pkg/receip" + receipt="$wok/$pkg/receipt" 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 "$receip" ]; then - gettext "Can't find receip in wok for:" + if [ ! -f "$receipt" ]; then + gettext "Can't find receipt in wok for:" colorize 31 " $pkg" && exit 1 fi @@ -81,12 +81,12 @@ separator rm -rf ${cache} && mkdir -p ${cache} ${cooked} - # Check receip - [ "$verbose" ] && gettext "Checking receip variables..." - . ${receip} + # Check receipt + [ "$verbose" ] && gettext "Checking receipt variables..." + . ${receipt} for var in PACKAGE VERSION SHORT_DESC MAINTAINER LICENSE WEB_SITE do - value="$(. $receip; eval echo \$$var)" + value="$(. $receipt; 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")\"" >> ${receip} + echo "build_date=\"$(date "+%Y-%m-%d %H:%M")\"" >> ${receipt} 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 ${receip} + sed -i "/^build_date=/"d ${receipt} rm -rf ${cache} && newline ;; -e|extract) @@ -178,7 +178,7 @@ boldify " $installed_nb" separator for pkg in $(ls ${installed}); do - . ${wok}/${pkg}/receip + . ${wok}/${pkg}/receipt 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}/receip + . ${wok}/${pkg}/receipt 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/receip" ]; then - . ${installed}/${pkg}/receip + if [ -f "$installed/$pkg/receipt" ]; then + . ${installed}/${pkg}/receipt newline gettext "Installed package:"; colorize 32 " $PACKAGE $VERSION" separator diff -r f10893862ba5 -r 2f6240aa30fd wok/sup-demo/receip --- a/wok/sup-demo/receip Fri Feb 24 20:19:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# SliTaz User Package receip - -PACKAGE="sup-demo" -VERSION="0.1" -SHORT_DESC="Short package description and information" -MAINTAINER="devel@slitaz.org" -LICENSE="BSD" -WEB_SITE="http://www.slitaz.org/" - -# Sup dependencies will be automaticaly downloaded but system wide -# deps must be manually installed by root. -SUP_DEPS="" -DEPENDS="" - -# Here are the optional install rules (download, configure, etc) -sup_install() { - echo "Running sup_install() sequence" -} diff -r f10893862ba5 -r 2f6240aa30fd wok/sup-demo/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wok/sup-demo/receipt Sun Feb 26 10:04:31 2017 +0000 @@ -0,0 +1,18 @@ +# SliTaz User Package receipt + +PACKAGE="sup-demo" +VERSION="0.1" +SHORT_DESC="Short package description and information" +MAINTAINER="devel@slitaz.org" +LICENSE="BSD" +WEB_SITE="http://www.slitaz.org/" + +# Sup dependencies will be automatically downloaded but system wide +# deps must be manually installed by root. +SUP_DEPS="" +DEPENDS="" + +# Here are the optional install rules (download, configure, etc) +sup_install() { + echo "Running sup_install() sequence" +} diff -r f10893862ba5 -r 2f6240aa30fd wok/sup-skel/receip --- a/wok/sup-skel/receip Fri Feb 24 20:19:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# SliTaz User Package receip - -PACKAGE="" -VERSION="" -SHORT_DESC="" -MAINTAINER="" -LICENSE="" -WEB_SITE="" - -# Sup dependencies will be automaticaly downloaded but system wide -# deps must be manually installed by root. -SUP_DEPS="" -DEPENDS="" - -# Here are the optional install rules (download, configure, etc) -sup_install() { - echo "" -} diff -r f10893862ba5 -r 2f6240aa30fd wok/sup-skel/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wok/sup-skel/receipt Sun Feb 26 10:04:31 2017 +0000 @@ -0,0 +1,18 @@ +# SliTaz User Package receipt + +PACKAGE="" +VERSION="" +SHORT_DESC="" +MAINTAINER="" +LICENSE="" +WEB_SITE="" + +# Sup dependencies will be automatically downloaded but system wide +# deps must be manually installed by root. +SUP_DEPS="" +DEPENDS="" + +# Here are the optional install rules (download, configure, etc) +sup_install() { + echo "" +}