чување 6750df2f93020c0c0c5c9b51d318e09592e8b249 родитељ 0c61f04624f81e2e1edbdfa0e1a5750a2095d1f1 Аутор: Страхиња Радић <contact@strahinja.org> Датум: Thu, 4 Aug 2022 12:37:38 +0200 Update README; properly handle update operation; don't discard output in package.mk Signed-off-by: Страхиња Радић <contact@strahinja.org> Diffstat:
| M | README | | | 10 | +++++----- |
| M | lib/package.mk | | | 4 | ++-- |
| M | mkpk | | | 11 | ++++++++--- |
измењених датотека: 3, додавања: 15(+), брисања: 10(-)
diff --git a/README b/README @@ -47,11 +47,11 @@ mkpk helper usage # mkpk update # Pulls the galeb-mkfiles repository # mkpk fetch foo # fetches the sources of foo to SRCBASEDIR -# mkpk build foo [ver] # builds the foo tarball and puts it into PKGDIR -# mkpk list foo [ver] # lists files in a built tarball -# mkpk install foo [ver] # installs the built tarball -# mkpk uninstall foo [ver] # uninstalls the package using tarball as - # filelist +# mkpk build foo # builds the foo tarball and puts it into PKGDIR +# mkpk list foo # lists files in a built and installed tarball +# mkpk install foo # installs the built tarball +# mkpk uninstall foo # uninstalls the package using built and + # installed tarball as filelist [1]: https://proot-me.github.io/ diff --git a/lib/package.mk b/lib/package.mk @@ -1,8 +1,8 @@ package:QV: printf " MK\t%s\n" "clean" - "${MK}" clean >/dev/null + "${MK}" clean printf " MK\t%s\n" "DESTDIR=pkgroot install" - "${MK}" DESTDIR=pkgroot install >/dev/null + "${MK}" DESTDIR=pkgroot install printf " PROOT\t%s\n" pkgroot "${PROOT}" -r pkgroot -0 -b /bin/tar -b /bin/xz -b /etc -w / tar -cJnf \ ${PKG}.tar.xz $(cd pkgroot; find . | sort | uniq | \ diff --git a/mkpk b/mkpk @@ -17,9 +17,14 @@ error() if [ "$(id -u)" -ne 0 ]; then error "You must be root to run ${0##*/}" -elif [ $# -lt 2 ]; then - usage - exit 1 +else + case "$1" in + update) ;; + *) if [ $# -lt 2 ]; then + usage + exit 1 + fi;; + esac fi command=$1