Fix remove
This commit is contained in:
parent
ea5e2042da
commit
ca12c0eee7
3 changed files with 9 additions and 8 deletions
11
.gitignore
vendored
11
.gitignore
vendored
|
|
@ -1,5 +1,6 @@
|
|||
.config
|
||||
pkg
|
||||
Zmakefile
|
||||
autodeploy.sh
|
||||
.deploytime
|
||||
/.config
|
||||
/pkg
|
||||
/Zmakefile
|
||||
/autodeploy.sh
|
||||
/.deploytime
|
||||
/zpkg
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ delete_files()
|
|||
{
|
||||
while read -r in
|
||||
do
|
||||
if [ -n "in" ]
|
||||
if [ -n "$in" ]
|
||||
then
|
||||
$1 rm -d "$in" 2>/dev/null
|
||||
fi
|
||||
|
|
@ -33,6 +33,6 @@ remove_package()
|
|||
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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ is_installed()
|
|||
# $1 = file
|
||||
view_package_file() {
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in a new issue