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

Fix remove

Browse source
This commit is contained in:
zawz 2020-05-22 16:33:16 +02:00
parent ea5e2042da
commit ca12c0eee7
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.gitignore vendored
View file

@ -1,5 +1,6 @@
.config /.config
pkg /pkg
Zmakefile /Zmakefile
autodeploy.sh /autodeploy.sh
.deploytime /.deploytime
/zpkg

4
src/remove.sh
View file

@ -6,7 +6,7 @@ delete_files()
{ {
while read -r in while read -r in
do do
if [ -n "in" ] if [ -n "$in" ]
then then
$1 rm -d "$in" 2>/dev/null $1 rm -d "$in" 2>/dev/null
fi fi
@ -33,6 +33,6 @@ remove_package()
tar -tf "$archive" HOME 2>/dev/null | sed 's|^HOME/||g' | tac | delete_files tar -tf "$archive" HOME 2>/dev/null | sed 's|^HOME/||g' | tac | delete_files
) )
rm "$archive" 2>/dev/null sudo rm "$archive" 2>/dev/null
sudo sed -i "/^$1 /d" installed sudo sed -i "/^$1 /d" installed
} }

2
src/view.sh
View file

@ -53,7 +53,7 @@ is_installed()
# $1 = file # $1 = file
view_package_file() { view_package_file() {
tree=$(tar -tJf "$1" 2>/dev/null) || exit $? tree=$(tar -tJf "$1" 2>/dev/null) || exit $?
echo "$tree" | sed "s|^ROOT/|/|g ; /\/$/d ; s|^HOME/|$HOME/|g ; /^DEPS/d ; /^DESC/d" 2>/dev/null echo "$tree" | grep -E '^ROOT/|^HOME/' | sed "/\/$/d ; s|^ROOT/|/|g ; s|^HOME/|$HOME/|g" 2>/dev/null
} }
# $1 = package name # $1 = package name