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

Optimize info

Browse source
This commit is contained in:
zawz 2020-05-26 22:58:54 +02:00
parent 074a91ea0a
commit 13f1569d3b
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/deploy.sh
View file

@ -52,7 +52,7 @@ deploy_folder()
archive="$(getname "$1").tar.$extension" archive="$(getname "$1").tar.$extension"
package "$1" "$tmpdirar/$archive" || return $? package "$1" "$tmpdirar/$archive" || return $?
deploy_package "$tmpdirar/$archive" || return $? deploy_package "$tmpdirar/$archive" || return $?
rm "$tmpdirar/$archive" rm "$tmpdirar"
else else
echo "Target '$1' doesn't exist" echo "Target '$1' doesn't exist"
fi fi

1
src/main.sh
View file

@ -127,7 +127,6 @@ deploy)
deploy_folder "$I" deploy_folder "$I"
pkglist="$pkglist $(getname "$I")" pkglist="$pkglist $(getname "$I")"
done done
echo "$pkglist"
update_remote_database $pkglist update_remote_database $pkglist
;; ;;
*) usage && exit 1 ;; *) usage && exit 1 ;;

20
src/print.sh
View file

@ -42,29 +42,35 @@ package_info() {
status="not installed" status="not installed"
grep -wq "^$1" "$PKG_PATH/pkglist" 2>/dev/null || { echo "Package '$I' not found" && return 1; } grep -wq "^$1" "$PKG_PATH/pkglist" 2>/dev/null || { echo "Package '$I' not found" && return 1; }
grep -wq "^$1" "$PKG_PATH/installed" 2>/dev/null && status=installed grep -wq "^$1" "$PKG_PATH/installed" 2>/dev/null && status=installed
tmpdir="/tmp/zpkg_$(random_string 5)"
mkdir -p "$tmpdir" || return $?
pwd="$(pwd)"
cd "$tmpdir"
if [ "$status" = "installed" ] && [ -f "$PKG_PATH/$1.tar.$extension" ] if [ "$status" = "installed" ] && [ -f "$PKG_PATH/$1.tar.$extension" ]
then then
pkg="$PKG_PATH/$1.tar.$extension" pkg="$PKG_PATH/$1.tar.$extension"
else else
tmpdir="/tmp/zpkg_$(random_string 5)"
pwd=$(pwd)
mkdir "$tmpdir"
fetch_package "$1" >/dev/null 2>&1 || { echo "Error fetching package" >&2 && ret=$?; } fetch_package "$1" >/dev/null 2>&1 || { echo "Error fetching package" >&2 && ret=$?; }
pkg="$1.tar.$extension" pkg="$1.tar.$extension"
fi fi
deps=$(deps "$1") unpack "$pkg" >/dev/null
desc=$(desc "$pkg" 2>/dev/null) deps=$(cat DEPS 2>/dev/null)
desc=$(cat DESC 2>/dev/null)
csize=$(stat -c '%s' "$pkg" | numfmt --to=iec-i --suffix=B --padding 6) csize=$(stat -c '%s' "$pkg" | numfmt --to=iec-i --suffix=B --padding 6)
isize=$($pcompress -dc "$pkg" | wc -c | 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)
[ -n "$cleanup" ] && { cd "$pwd"; rm -rd "$tmpdir"; } [ -n "$cleanup" ] && { cd "$pwd"; rm -rd "$tmpdir"; }
cd "$pwd"
rm -rf "$tmpdir"
[ -n "$ret" ] && return $ret [ -n "$ret" ] && return $ret
printf "Name: %s\n" "$1" printf "Name: %s\n" "$1"
printf "Description: %s\n" "$desc" printf "Description: %s\n" "$desc"
echo "" echo ""
printf "Status: %s\n" "$status" printf "Status: %s\n" "$status"
printf "Dependencies: %s\n" "$(deps "$1" | tr -s ' \n' ' ')" printf "Dependencies: %s\n" "$deps"
printf "Package size: %s\n" "$csize" printf "Package size: %s\n" "$csize"
printf "Installed size: %s\n" "$isize" printf "Installed size: %s\n" "$isize"
} }