Fix pixz behaviour
This commit is contained in:
parent
6e29088d94
commit
cac960da57
7 changed files with 8 additions and 8 deletions
|
|
@ -28,7 +28,7 @@ fi
|
|||
for I in $list
|
||||
do
|
||||
TIME=$(stat -c "%Y" "$I.tar.$extension")
|
||||
DEPS=$($pcompress -dc "$I.tar.$extension" | tar -xOf - DEPS 2>/dev/null | tr -s '\n\t ' ' ')
|
||||
DEPS=$(cat "$I.tar.$extension" | $pcompress -dc 2>/dev/null | tar -xOf - DEPS 2>/dev/null | tr -s '\n\t ' ' ')
|
||||
if grep -q -w "^$I" pkglist 2>/dev/null
|
||||
then
|
||||
sed -i "s|^$I .*\$|$I $TIME $DEPS|g" pkglist
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ mkdir -p "$tmpdir" || exit $?
|
|||
echo "Cannot reach $HTTP_ADDRESS" > /dev/stderr
|
||||
exit 1
|
||||
fi
|
||||
$pcompress -dc "zpkg.tar.$extension" | tar -xf - || exit $?
|
||||
cat "$zpkg.tar.$extension" | $pcompress -dc 2>/dev/null | tar -xf - || exit $?
|
||||
|
||||
# install zpkg package
|
||||
ROOT/usr/local/bin/zpkg -f install zpkg || exit $?
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ deploy_folder()
|
|||
{
|
||||
if [ -f "$1" ] && echo "$1" | grep -q '\.tar\.'"$extension\$" # file and valid extension
|
||||
then
|
||||
$pcompress -dc >/dev/null 2>&1 | tar -tf - >/dev/null 2>&1|| { echo "File '$1' is not a valid archive" && return 1; }
|
||||
cat "$1" | $pcompress -dc 2>/dev/null | tar -tf - >/dev/null 2>&1|| { echo "File '$1' is not a valid archive" && return 1; }
|
||||
deploy_package "$1" "$1" || return $?
|
||||
elif [ -d "$1" ] # folder
|
||||
then
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
unpack()
|
||||
{
|
||||
echo "Unpacking $1"
|
||||
$pcompress -dc "$1" | tar -xf -
|
||||
cat "$1" | $pcompress -dc 2>/dev/null | tar -xf -
|
||||
}
|
||||
|
||||
# $1 = package , $2 = prefix
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ remove_package()
|
|||
fi
|
||||
echo "Removing $1"
|
||||
|
||||
list=$($pcompress -dc "$archive" | tar -tf - 2>/dev/null)
|
||||
list=$(cat "$archive" | $pcompress -dc 2>/dev/null | tar -tf - 2>/dev/null)
|
||||
echo "$list" | grep "^ROOT/" | sed 's|^ROOT/||g' | tac | delete_files / $2
|
||||
echo "$list" | grep "^HOME/" | sed 's|^HOME/||g' | tac | delete_files "$HOME"
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ upgrade_package()
|
|||
fetch_package "$1" || { echo "Package '$1' not found" >&2 && return 1; }
|
||||
unpack "$1.tar.$extension" || return $?
|
||||
|
||||
oldlist=$($pcompress -dc "$PKG_PATH/$1.tar.$extension" | tar -tf - 2>/dev/null | sort)
|
||||
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 / $2
|
||||
echo "$oldlist" | grep "^HOME/" | to_delete - HOME | sed 's|^HOME/||g' | tac | delete_files "$HOME"
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ deps()
|
|||
|
||||
# $1 = pkg file
|
||||
desc() {
|
||||
$pcompress -dc "$1" | tar -xOf - DESC
|
||||
cat "$1" | $pcompress -dc 2>/dev/null | tar -xOf - DESC
|
||||
}
|
||||
|
||||
resolve_packages()
|
||||
|
|
@ -52,7 +52,7 @@ is_installed()
|
|||
|
||||
# $1 = file
|
||||
view_package_file() {
|
||||
tree=$($pcompress -dc "$1" 2>/dev/null | tar -tf - 2>/dev/null) || exit $?
|
||||
tree=$(cat "$1" | $pcompress -dc 2>/dev/null | tar -tf - 2>/dev/null) || exit $?
|
||||
echo "$tree" | grep -E '^ROOT/|^HOME/' | sed "/\/$/d ; s|^ROOT/|/|g ; s|^HOME/|$HOME/|g" 2>/dev/null
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue