diff --git a/server_scripts/database_update.sh b/server_scripts/database_update.sh index e04b529..da0f85a 100755 --- a/server_scripts/database_update.sh +++ b/server_scripts/database_update.sh @@ -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 diff --git a/server_scripts/gen_install.sh b/server_scripts/gen_install.sh index d8645d7..abc42a8 100755 --- a/server_scripts/gen_install.sh +++ b/server_scripts/gen_install.sh @@ -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 $? diff --git a/src/deploy.sh b/src/deploy.sh index eca8c3e..390402a 100644 --- a/src/deploy.sh +++ b/src/deploy.sh @@ -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 diff --git a/src/install.sh b/src/install.sh index 49b20e6..d6d58cc 100644 --- a/src/install.sh +++ b/src/install.sh @@ -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 diff --git a/src/remove.sh b/src/remove.sh index 3dc728d..0c53b11 100644 --- a/src/remove.sh +++ b/src/remove.sh @@ -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" diff --git a/src/upgrade.sh b/src/upgrade.sh index 6f92223..4637354 100644 --- a/src/upgrade.sh +++ b/src/upgrade.sh @@ -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" diff --git a/src/view.sh b/src/view.sh index ce42ecc..19043c4 100644 --- a/src/view.sh +++ b/src/view.sh @@ -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 }