# HG changeset patch # User Christopher Rogers # Date 1356010281 0 # Node ID 254bf0179a7e8a9cd31c00b2ee3e954d2d4847bb # Parent a78d26cd317875fb7bdd33c64627bd9bcec18d71 spk-rm: Moved remove_file function to libspk.sh. diff -r a78d26cd3178 -r 254bf0179a7e lib/libspk.sh --- a/lib/libspk.sh Tue Sep 18 22:21:11 2012 +0200 +++ b/lib/libspk.sh Thu Dec 20 13:31:21 2012 +0000 @@ -322,3 +322,16 @@ is_elf() { [ "$(dd if=$1 bs=1 skip=1 count=3 2> /dev/null)" = "ELF" ] } + +# Avoid dirname errors by checking for argument and then remove file and +# empty directory. Usage: remove_file file +remove_file() { + [ "$1" ] || return + local dir + rm -f $1 2>/dev/null + dir="$1" + while [ "$dir" != "/" ]; do + dir="$(dirname $dir)" + rmdir $dir 2> /dev/null || break + done +} diff -r a78d26cd3178 -r 254bf0179a7e spk-rm --- a/spk-rm Tue Sep 18 22:21:11 2012 +0200 +++ b/spk-rm Thu Dec 20 13:31:21 2012 +0000 @@ -34,19 +34,6 @@ exit 0 } -# Avoid dirname errors by checking for argument and then remove file and -# empty directory. Usage: remove_file file -remove_file() { - [ "$1" ] || return - local dir - rm -f $1 2>/dev/null - dir="$1" - while [ "$dir" != "/" ]; do - dir="$(dirname $dir)" - rmdir $dir 2> /dev/null || break - done -} - # Remove a single package remove() { local altered