better dependency tracking
This commit is contained in:
parent
b92274158e
commit
cf2098a0cb
3 changed files with 36 additions and 5 deletions
12
Makefile
Normal file
12
Makefile
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
.POSIX:
|
||||||
|
|
||||||
|
PREFIX=/usr
|
||||||
|
DESTDIR=
|
||||||
|
|
||||||
|
.PHONY: all install
|
||||||
|
|
||||||
|
.DEFAULT: all
|
||||||
|
|
||||||
|
install:
|
||||||
|
install -Dm755 ./iglu.sh $(DESTDIR)$(PREFIX)/sbin/iglu
|
||||||
|
install -Dm755 ./iglupkg.sh $(DESTDIR)$(PREFIX)/bin/iglupkg
|
24
iglu.sh
24
iglu.sh
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# usage: iglu [ add | del ] <pkg>
|
# usage: iglu [ add | del | has ] <pkg>
|
||||||
#
|
#
|
||||||
# WONTFIX:
|
# WONTFIX:
|
||||||
# - circular deps shall not be handled
|
# - circular deps shall not be handled
|
||||||
|
@ -7,7 +7,7 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "usage: $(basename $0) [add | del] <pkg>"
|
echo "usage: $(basename $0) [add | del | has] <pkg>"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,9 +59,19 @@ PKG=$2
|
||||||
|
|
||||||
[ -z "$1" ] && usage
|
[ -z "$1" ] && usage
|
||||||
|
|
||||||
[ $(id -u) -eq 0 ] || fatal "root permissions needed"
|
root_req() {
|
||||||
|
[ $(id -u) -eq 0 ] || fatal "root permissions needed"
|
||||||
|
}
|
||||||
|
|
||||||
|
has() {
|
||||||
|
while [ ! -z "$1" ]; do
|
||||||
|
[ -f "/usr/share/iglupkg/$1" ]
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
if [ "$CMD" = "add" ]; then
|
if [ "$CMD" = "add" ]; then
|
||||||
|
root_req
|
||||||
META_PATH=$(tar -I zstd -tf "$PKG" | grep 'usr/share/iglupkg/' | tail -n1)
|
META_PATH=$(tar -I zstd -tf "$PKG" | grep 'usr/share/iglupkg/' | tail -n1)
|
||||||
PKGNAME=$(basename "$META_PATH")
|
PKGNAME=$(basename "$META_PATH")
|
||||||
|
|
||||||
|
@ -77,12 +87,12 @@ if [ "$CMD" = "add" ]; then
|
||||||
|
|
||||||
|
|
||||||
warn "removing duplicate files ..."
|
warn "removing duplicate files ..."
|
||||||
TO_REMOVE=$(diff -u "$TMP_DIR/old" "$TMP_DIR/new" | grep -v '^---' | grep -E '^\-' | cut -d'-' -f 2 | awk '{ print "/"$1 }')
|
TO_REMOVE=$(diff -u "$TMP_DIR/old" "$TMP_DIR/new" | grep -v '^---' | grep -E '^\-' | cut -d'-' -f2- | awk '{ print "/"$1 }')
|
||||||
|
|
||||||
[ -z "$TO_REMOVE" ] || warn "will remove $TO_REMOVE"
|
[ -z "$TO_REMOVE" ] || warn "will remove $TO_REMOVE"
|
||||||
continue_interactive
|
continue_interactive
|
||||||
|
|
||||||
remove "$TO_REMOVE"
|
remove $TO_REMOVE
|
||||||
else
|
else
|
||||||
warn "installing $PKGNAME ..."
|
warn "installing $PKGNAME ..."
|
||||||
continue_interactive
|
continue_interactive
|
||||||
|
@ -90,6 +100,7 @@ if [ "$CMD" = "add" ]; then
|
||||||
tar -I zstd -C / -xf "$PKG"
|
tar -I zstd -C / -xf "$PKG"
|
||||||
rm -rf "$TMP_DIR"
|
rm -rf "$TMP_DIR"
|
||||||
elif [ "$CMD" = "del" ]; then
|
elif [ "$CMD" = "del" ]; then
|
||||||
|
root_req
|
||||||
META_PATH="/usr/share/iglupkg/$PKG"
|
META_PATH="/usr/share/iglupkg/$PKG"
|
||||||
[ -f "$META_PATH" ] || fatal "package $PKG not installed"
|
[ -f "$META_PATH" ] || fatal "package $PKG not installed"
|
||||||
TO_REMOVE=$(chop_fs $META_PATH | awk '{ print "/"$1 }')
|
TO_REMOVE=$(chop_fs $META_PATH | awk '{ print "/"$1 }')
|
||||||
|
@ -97,6 +108,9 @@ elif [ "$CMD" = "del" ]; then
|
||||||
continue_interactive
|
continue_interactive
|
||||||
|
|
||||||
remove $TO_REMOVE
|
remove $TO_REMOVE
|
||||||
|
elif [ "$CMD" = "has" ]; then
|
||||||
|
shift
|
||||||
|
has $@
|
||||||
else
|
else
|
||||||
fatal "unknown command $CMD"
|
fatal "unknown command $CMD"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -100,6 +100,11 @@ export JOBS=$(nproc)
|
||||||
|
|
||||||
. ./build.sh
|
. ./build.sh
|
||||||
|
|
||||||
|
[ -z "$mkdeps" ] || iglu has $(echo $mkdeps | sed -e "s|:| |g") \
|
||||||
|
|| fatal 'missing make dependancies'
|
||||||
|
[ -z "$deps" ] || iglu has $(echo $deps | sed -e "s|$|$cross|" -e "s|:|$cross |g") \
|
||||||
|
|| fatal 'missing runtime dependancies'
|
||||||
|
|
||||||
srcdir="$(pwd)/src"
|
srcdir="$(pwd)/src"
|
||||||
outdir="$(pwd)/out"
|
outdir="$(pwd)/out"
|
||||||
pkgdir="$(pwd)/out/$pkgname$cross.$pkgver"
|
pkgdir="$(pwd)/out/$pkgname$cross.$pkgver"
|
||||||
|
|
Loading…
Reference in a new issue