zawz/zpkg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

perf: switch to use metadata instead of archive

Browse source
This commit is contained in:
zawz 2022-05-06 14:47:36 +02:00
parent 7369df504d
commit 07da873bb3
9 changed files with 156 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/hooks.sh
View file

@ -1,16 +1,25 @@
#!/bin/sh
# $1 = op , $2 = pre/post , $3 = sudo prefix
# $1 = package , $2 = hook name , $3 = sudo
one_hook() {
tmpfile="$TMPDIR/zpkg_hook_$(random_string 5)"
contents=$(metadata_get "${2}" < "$PKG_PATH/$1.dat")
local ret=0
if [ -n "$contents" ] ; then
printf "%s\n" "$contents" | base64 -d > "$tmpfile"
chmod +x "$tmpfile"
$3 "$tmpfile"
ret=$?
fi
rm -f "$tmpfile"
return $ret
}
# $1 = op , $2 = pre/post , $3 = package , $4 = sudo prefix
hook() {
(
set -e
cd HOOKS 2>/dev/null || return 0
file=${2}_${1}
if [ -x "$file" ] ; then
$3 "./$file"
fi
if [ -x "${file}_user" ] ; then
"./${file}_user"
fi
one_hook "$3" "${2}_${1}" $4
one_hook "$3" "${2}_${1}_user"
)
}

16
src/install.sh
View file

@ -38,18 +38,12 @@ install_package()
(
cd "$tmpdir" || exit $?
fetch_package "$1" || { echo "Package '$1' not found" >&2 && return 1; }
$2 cp "$1.tar.$extension" "$PKG_PATH"
$2 chmod a+r "$PKG_PATH/$1.tar.$extension"
(
umask a+rx
unpack "$1.tar.$extension" $2 || return $?
hook install pre $2
[ -d "ROOT" ] || return 0
copy_files ROOT "$ROOT_PATH/" $2 2>/dev/null || return $?
) || return $?
copy_files HOME "$HOME" 2>/dev/null
unpack "$1.tar.$extension" $2 || exit $?
gen_metadata "$1.tar.$extension" | $2 tee "$PKG_PATH/$1.dat" >/dev/null
hook install pre "$1" $2
install_files "$1" $2
hook install post "$1" $2
add_package_entry "$1" $2
hook install post $2
)
ret=$?
rm -rf "$tmpdir" 2>/dev/null

3
src/main.sh
View file

@ -11,6 +11,7 @@
%include *.sh
case "$1" in
migrate) convert_to_metadata $sudo ;;
list) awk '{print $1}' "$PKG_PATH/installed" 2>/dev/null | sort ;;
list-all) awk '{print $1}' "$PKG_PATH/pkglist" 2>/dev/null | sort ;;
update-database) fetch_pkglist $sudo ;;
@ -38,7 +39,7 @@ show)
then
view_package "$I"
else
wget "$HTTP_ADDRESS/$1.tar.$extension" -q -O - 2>/dev/null | view_package_file - || { echo "Could not fetch package '$I'" >&2 ; return 1 ; }
fetch_package "$1" /dev/stdout 2>/dev/null | view_package_file - || { echo "Could not fetch package '$I'" >&2 ; return 1 ; }
fi
done
fi

51
src/metadata.sh Normal file
View file

@ -0,0 +1,51 @@
# stdin = metadata
# $1 = value
metadata_get() {
grep "^$1=" | cut -d= -f2-
}
# $1 = metadata , $2 = value
metadata_arg_get() {
printf "%s\n" "$1" | metadata_get "$2"
}
gen_hook_metadata() {
find HOOKS -type f -maxdepth 1 -perm -0100 2>/dev/null | while read -r ln ; do
printf "%s=%s\n" "$(basename "$ln")" $(base64 -w0 "$ln")
done
}
# $1 = file
gen_metadata() {
# extract values
deps=$(cat DEPS 2>/dev/null | tr -s ' \t\n' ' ')
desc=$(cat DESC 2>/dev/null)
csize=$(stat -c '%s' "$1")
isize=$(du -sb ROOT HOME 2>/dev/null | awk '{print $1}' | paste -sd+ | bc)
printf "desc=%s\n" "$desc"
printf "deps=%s\n" "$deps"
printf "pkgsize=%s\n" "$csize"
printf "installsize=%s\n" "$isize"
gen_hook_metadata
printf "tree=%s\n" "$(find ROOT HOME ! -type d 2>/dev/null | base64 -w0)"
printf "dirtree=%s\n" "$(find ROOT HOME -type d -mindepth 1 2>/dev/null | base64 -w0)"
}
# $1 = sudo
convert_to_metadata() {
find "$PKG_PATH" -type f -maxdepth 1 -name "*.tar.$extension" |
while read -r I ; do
pkgname=$(basename "${I%.tar.$extension}")
echo "Migrate $pkgname"
tmpdir="$TMPDIR/zpkg_$(random_string 5)"
mkdir -p "$tmpdir"
(
cd "$tmpdir" || exit $?
unpack "$I" $1 >/dev/null || exit $?
gen_metadata "$I" | $1 tee "$PKG_PATH/$pkgname.dat" >/dev/null
)
rm -rf "$tmpdir" 2>/dev/null
$1 rm -f "$I"
done
}

62
src/print.sh
View file

@ -40,44 +40,44 @@ error() {
printf "\033[1;31m%s\033[0m\n" "$1" >&2
}
# stdin = metadata
metadata_info() {
contents=$(cat)
metadata_arg_get "deps"
deps=$(metadata_arg_get "$contents" "deps")
desc=$(metadata_arg_get "$contents" "desc")
csize=$(metadata_arg_get "$contents" "pkgsize" | numfmt --to=iec-i --suffix=B --padding 6)
isize=$(metadata_arg_get "$contents" "installsize" | numfmt --to=iec-i --suffix=B --padding 6)
printf "Description: %s\n" "$desc"
printf "Dependencies: %s\n" "$deps"
printf "Package size: %s\n" "$csize"
printf "Installed size: %s\n" "$isize"
}
# $1 = package name
package_info() {
# prepare
tmpdir="$TMPDIR/zpkg_$(random_string 5)"
mkdir -p "$tmpdir" || return $?
pwd="$(pwd)"
cd "$tmpdir"
# get status
status="not installed"
grep -q "^$1 " "$PKG_PATH/pkglist" 2>/dev/null || { echo "Package '$1' not found" && return 1; }
grep -q "^$1 " "$PKG_PATH/installed" 2>/dev/null && status=installed
# get and unpack
if [ "$status" = "installed" ] && [ -f "$PKG_PATH/$1.tar.$extension" ]
then
pkg="$PKG_PATH/$1.tar.$extension"
else
fetch_package "$1" >/dev/null 2>&1 || { echo "Error fetching package" >&2 && ret=$?; }
pkg="$1.tar.$extension"
fi
unpack "$pkg" >/dev/null
# extract values
deps=$(cat DEPS 2>/dev/null | tr -s ' \t\n' ' ')
desc=$(cat DESC 2>/dev/null)
csize=$(stat -c '%s' "$pkg" | numfmt --to=iec-i --suffix=B --padding 6)
isize=$(du -sb ROOT HOME 2>/dev/null | awk '{print $1}' | paste -sd+ | bc | numfmt --to=iec-i --suffix=B --padding 6)
cd "$pwd"
rm -rf "$tmpdir"
[ -n "$ret" ] && return $ret
printf "Name: %s\n" "$1"
printf "Description: %s\n" "$desc"
printf "Status: %s\n" "$status"
printf "Dependencies: %s\n" "$deps"
printf "Package size: %s\n" "$csize"
printf "Installed size: %s\n" "$isize"
printf "\n"
# get and unpack
if [ "$status" = "installed" ] && [ -f "$PKG_PATH/$1.dat" ]
then
cat "$PKG_PATH/$1.dat"
else
tmpdir="$TMPDIR/zpkg_$(random_string 5)"
mkdir -p "$tmpdir" || return $?
(
cd "$tmpdir"
fetch_package "$1" >/dev/null 2>&1 || { echo "Error fetching package" >&2 && ret=$?; }
unpack "$1.tar.$extension"
gen_metadata "$1.tar.$extension"
)
rm -rf "$tmpdir"
fi | metadata_info
echo
}

20
src/process.sh Normal file
View file

@ -0,0 +1,20 @@
install_files() {
(
umask a+rx
set -e
if [ -d "ROOT" ] ; then
copy_files ROOT "$ROOT_PATH/" $2 2>/dev/null
fi
if [ -d "HOME" ] ; then
copy_files HOME "$HOME" 2>/dev/null
fi
add_package_entry "$1" $2
)
}
# $1 = package , $2 = sudo
remove_files() {
filetree=$(metadata_get tree < "$PKG_PATH/$1.dat" | base64 -d)
printf "%s\n" "$filetree" | grep "^ROOT/" | to_delete - ROOT | sed 's|^ROOT/||g' | tac | delete_files "$ROOT_PATH/" $2
printf "%s\n" "$filetree" | grep "^HOME/" | to_delete - HOME | sed 's|^HOME/||g' | tac | delete_files "$HOME"
}

43
src/remove.sh
View file

@ -5,37 +5,38 @@
delete_files()
{
cd "$1" || return $?
$2 xargs -d '\n' rm -d 2>/dev/null
list=$(cat)
printf "%s\n" "$list" | tr '\n' '\0' | $2 xargs -0 rm -d 2>/dev/null
printf "%s\n" "$list" | tr '\n' '\0' | xargs -0 -n1 dirname | uniq |
tr '\n' '\0' | $2 xargs -0 rmdir -p 2>/dev/null
}
# stdin: old list
# $1 = old list , $2 = new path
to_delete()
{
find "$2" -type d 2>/dev/null | sed 's|$|/|g' > tmplist
find "$2" -type f 2>/dev/null >> tmplist
sort tmplist > list
diff --new-line-format="" --unchanged-line-format="" "$1" list
rm tmplist list
}
# $1 = package , $2 = prefix
remove_package()
{
archive="$PKG_PATH/$1.tar.$extension"
if [ ! -f "$archive" ] || ! grep -q "^$1 " "$PKG_PATH/installed"
if [ ! -f "$PKG_PATH/$1.dat" ] || ! grep -q "^$1 " "$PKG_PATH/installed"
then
echo "Package '$1' not installed" >&2
return 1
fi
tmpdir="$TMPDIR/zpkg_$(random_string 5)"
mkdir -p "$tmpdir"
(
cd "$tmpdir" || exit $?
echo "Removing $1"
echo "Removing $1"
unpack "$archive" $2 HOOKS >/dev/null 2>&1 || true
hook remove pre "$1" $2
remove_files "$1" $2
hook remove post "$1" $2
$2 rm -f "$PKG_PATH/$1.dat" 2>/dev/null
$2 sed -i "/^$1 /d" "$PKG_PATH/installed"
hook remove pre $2
list=$(cat "$archive" | $pcompress -dc 2>/dev/null | tar -tf - 2>/dev/null)
echo "$list" | grep "^ROOT/" | sed 's|^ROOT/||g' | tac | delete_files "$ROOT_PATH/" $2
echo "$list" | grep "^HOME/" | sed 's|^HOME/||g' | tac | delete_files "$HOME"
$2 rm "$archive" 2>/dev/null
$2 sed -i "/^$1 /d" "$PKG_PATH/installed"
hook remove post $2
)
ret=$?
rm -rf "$tmpdir" 2>/dev/null
}

29
src/upgrade.sh
View file

@ -1,16 +1,5 @@
#!/bin/sh
# stdin: old list
# $1 = old list , $1 = new path
to_delete()
{
find "$2" -type d 2>/dev/null | sed 's|$|/|g' > tmplist
find "$2" -type f 2>/dev/null >> tmplist
sort tmplist > list
diff --new-line-format="" --unchanged-line-format="" "$1" list
rm tmplist list
}
# $1 = package , $2 = prefix
upgrade_package()
{
@ -24,19 +13,11 @@ upgrade_package()
fetch_package "$1" || { echo "Package '$1' not found" >&2 && return 1; }
unpack "$1.tar.$extension" || return $?
hook upgrade pre $2
oldlist=$(cat "$PKG_PATH/$1.tar.$extension" | $pcompress -dc 2>/dev/null | tar -tf - 2>/dev/null | sort)
echo "$oldlist" | grep "^ROOT/" | to_delete - ROOT | sed 's|^ROOT/||g' | tac | delete_files "$ROOT_PATH/" $2
echo "$oldlist" | grep "^HOME/" | to_delete - HOME | sed 's|^HOME/||g' | tac | delete_files "$HOME"
copy_files ROOT "$ROOT_PATH/" $2 2>/dev/null
copy_files HOME "$HOME" 2>/dev/null
$2 cp "$1.tar.$extension" "$PKG_PATH"
$2 chmod a+r "$PKG_PATH/$1.tar.$extension"
add_package_entry "$1" $2
hook upgrade post $2
hook upgrade pre "$1" $2
remove_files "$1" $2
gen_metadata . | $2 tee "$PKG_PATH/$1.dat" >/dev/null
install_files "$1" $2
hook upgrade post "$1" $2
)
ret=$?
rm -rf "$tmpdir" 2>/dev/null

4
src/view.sh
View file

@ -58,12 +58,12 @@ is_installed()
# $1 = file
view_package_file() {
tree=$(cat "$1" | $pcompress -dc 2>/dev/null | tar -tf - 2>/dev/null) || exit $?
echo "$tree" | grep -E '^ROOT/|^HOME/' | sed "/\/$/d ; s|^ROOT/|$ROOT_PATH/|g ; s|^HOME/|$HOME/|g" 2>/dev/null
echo "$tree" | grep -E '^ROOT/|^HOME/' | sed "/\/$/d ; s|^ROOT/|$ROOT_PATH/|g ; s|^HOME/|$HOME/|g"
}
# $1 = package name
view_package() {
( cd "$PKG_PATH" && view_package_file "$1.tar.$extension" )
metadata_get tree < "$PKG_PATH/$1.dat" | base64 -d | sed "s|^ROOT/|$ROOT_PATH/|g ; s|^HOME/|$HOME/|g" | sort
}
removed_packages()