xbps stuff

Author: Ella-0

Makefile

@@ -7,6 +7,9 @@ DESTDIR=
 
 .DEFAULT: all
 
+ARCH=x86_64
+
 install:
 	install -Dm755 ./iglu.sh $(DESTDIR)$(PREFIX)/sbin/iglu
 	install -Dm755 ./iglupkg.sh $(DESTDIR)$(PREFIX)/bin/iglupkg
+	install -Dm644 ./mirror.list $(DESTDIR)/etc/mirror.list

iglu.sh

@@ -1,141 +1,54 @@
-#!/bin/sh
+#!/bin/sh -e
 # usage: iglu [ add | del | has ] <pkg>
-#
-# WONTFIX:
-#  - circular deps shall not be handled
-
-set -e
-
-usage() {
-	if [ ! -z "$1" ]; then
-		echo "FATAL: $@"
-	fi
-	echo "usage: $(basename $0) [add | del | has | b | ba] <pkg>"
-	echo "version: 0.2.0"
-	exit 1
-}
 
 fatal() {
-	echo "ERROR: $@"
+	printf "ERROR: %s\n" "$@"
 	exit 1
 }
 
 warn() {
-	echo "WARNING: $@"
-}
-
-chop_fs() {
-	sed -n '/\[fs\]/,/\[backup\]/{/\[fs\]\|\[backup\]/!p}' "$1" \
-		| awk '{print length, $0}' | sort -rn | cut -d' ' -f2-
+	printf "WARNING: %s\n" "$@"
 }
 
-continue_interactive() {
-	printf '%s' "Do you wish to proceed?: "
-	read yn
-	case $yn in
-		[Yy]* ) echo "Proceeding";;
-		[Nn]* ) exit;;
-		* ) exit;;
-	esac
-}
-
-remove() {
-	set +e
-	rm -f "$@" 2> /dev/null
-	while shift 2> /dev/null; do
-		if [ -d "/$1" ]; then
-			rmdir "/$1" 2> /dev/null
-		elif [ -f "/$1" ]; then
-			rm -f "/$1" 2> /dev/null
-		fi
-	done
-	set -e
-}
-
-assert_deps() {
-	for dep in $(grep '^deps=' "$1" | cut -d'=' -f2- | tr ':' '\n'); do
-		[ -f "/usr/share/iglupkg/$dep" ] || fatal "Missing dep $dep"
-	done
-}
-
-CMD=$1
-PKG=$2
-
-[ -z "$1" ] && usage
-
-root_req() {
-	[ $(id -u) -eq 0 ] || fatal "root permissions needed"
-}
-
-has() {
-	while [ ! -z "$1" ]; do
-		>&2 echo "checking dep $1"
-		[ -f "/usr/share/iglupkg/$1" ]
-		shift
-	done
-}
-
-iglupkg_check() {
-	if ! command -v iglupkg > /dev/null 2>&1; then
-		echo "iglupkg is missing??!!"
-		exit 1
+usage() {
+	if [ ! -z "$1" ]; then
+		fatal "$@"
 	fi
+	printf "usage: %s [add | del | has] <pkg>\n" $(basename "$0")
+	printf "version: 0.3.0\n"
+	exit 1
 }
 
-
-if [ "$CMD" = "add" ]; then
-	root_req
-	META_PATH=$(tar -I zstd -tf "$PKG" | grep 'usr/share/iglupkg/' | tail -n1)
-	PKGNAME=$(basename "$META_PATH")
-
-	TMP_DIR=$(mktemp -d)
-	tar -I zstd -C "$TMP_DIR" -xf "$PKG" "$META_PATH"
-	assert_deps "$TMP_DIR/$META_PATH"
-
-	if [ -f "/$META_PATH" ]; then
-		warn "package $PKGNAME already installed. upgrading ..."
-
-		chop_fs "$TMP_DIR/$META_PATH" > "$TMP_DIR/new"
-		chop_fs "/$META_PATH" > "$TMP_DIR/old"
-
-
-		warn "removing duplicate files ..."
-		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"
-		continue_interactive
-
-		remove $TO_REMOVE
-	else
-		warn "installing $PKGNAME ..."
-		continue_interactive
-	fi
-	tar -I zstd -C / -xf "$PKG"
-	rm -rf "$TMP_DIR"
-elif [ "$CMD" = "del" ]; then
-	root_req
-	META_PATH="/usr/share/iglupkg/$PKG"
-	[ -f "$META_PATH" ] || fatal "package $PKG not installed"
-	TO_REMOVE=$(chop_fs $META_PATH | awk '{ print "/"$1 }')
-	[ -z "$TO_REMOVE" ] || warn "will remove $TO_REMOVE"
-	continue_interactive
-
-	remove $TO_REMOVE
-elif [ "$CMD" =  "has" ]; then
-	shift
-	has $@
-elif [  "$CMD" = "b" ]; then
-    #BUILD
-	iglupkg_check
-	iglupkg || exit 1
-elif [ "$CMD" =  "ba" ]; then
-    #BUILD INSTALL
-	iglupkg_check
-	iglupkg || exit 1
-	cd out/
-	for pkg in *.tar.*; do
-		iglu add "$pkg"
-	done
-else
-	usage "unknown command $CMD"
+if [ -z "$1" ]
+then
+	usage
 fi
+
+case "$1" in
+	add)
+		case "$2" in
+			*.xbps)
+				REPO=/var/lib/iglu
+				cp "$2" "$REPO"
+				cd "$REPO"
+				rm -f *-repodata
+				xbps-rindex -a *.xbps
+				cd -
+				b_name=$(basename "$2" | cut -d'.' -f1 | rev | cut -d'-' -f2- | rev)
+				xbps-install --repository="$REPO" "$b_name" -f
+				;;
+			*)
+				xbps-install "$2"
+				;;
+		esac
+		;;
+	del)
+		xbps-remove -R "$2"
+		;;
+	has)
+		xbps-query "$2"
+		;;
+	*)
+		usage "unknown sub command: $1"
+		;;
+esac

iglupkg.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+pkgrel=0
 muon_base_args="-Dbuildtype=release \
 -Dprefix=/usr \
 -Dlibexecdir=lib \
@@ -143,9 +144,9 @@ export JOBS=$(nproc)
 . ./build.sh
 
 if command -V iglu 2>/dev/null; then
-	[ -z "$mkdeps" ] || iglu has $(echo $mkdeps | sed -e "s|:| |g") \
+	[ -z "$mkdeps" ] || iglu has $mkdeps \
 		|| fatal 'missing make dependancies'
-	[ -z "$deps" ] || iglu has $(echo $deps | sed -e "s|$|$cross|" -e "s|:|$cross |g") \
+	[ -z "$deps" ] || iglu has $deps \
 		|| fatal 'missing runtime dependancies'
 fi
 
@@ -202,12 +203,12 @@ _p() {
 	install -d "$pkgdir/usr/share/iglupkg/"
 	cd "$srcdir"
 	_genmeta > "$pkgdir/usr/share/iglupkg/$pkgname$cross"
-	cd "$pkgdir"
-	if command -V zstd; then
-		tar --owner=0 --group=0 -cf ../$pkgname$cross.$pkgver.tar.zst * -I zstd
-	else
-		tar --owner=0 --group=0 -cf ../$pkgname$cross.$pkgver.tar *
-	fi
+	all_deps="$deps:$rdeps"
+	IFS=: set -- $all_deps
+	n_deps=$(printf '%s\n' $@ | grep -v '>=' | awk '{printf $0">=0"}')
+	y_deps=$(printf '%s\n' $@ | grep '>=' || : )
+	cd "$outdir"
+	xbps-create -A $ARCH-musl -n $pkgname-$pkgver\_$pkgrel -s "$desc" -D "$n_deps $y_deps" "$pkgdir"
 }
 
 if [ -z "$to_run" ]; then

mirror.list

@@ -0,0 +1 @@
+https://mirror.iglunix.org