Ongoing fixes on rhbz#2100617
- properly elaborat eonl on one file $x instead of $@ - proeprly cleanup config dir - do not check switch for existence but jsut use it
This commit is contained in:
parent
85ac4b99f5
commit
a388f23a90
@ -37,17 +37,23 @@ mvDebug() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
rmDebug() {
|
rmDebug() {
|
||||||
|
local switch=""
|
||||||
for x in "$@" ; do
|
for x in "$@" ; do
|
||||||
if isJavaConfig "$x" ; then
|
if [[ $x == -* ]] ; then
|
||||||
cmdvDebug rm "$@"
|
switch="$switch $x"
|
||||||
|
elif isJavaConfig "$x" ; then
|
||||||
|
cmdvDebug rm $switch "$x"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
rmdirDebug() {
|
rmdirDebug() {
|
||||||
|
local switch=""
|
||||||
for x in "$@" ; do
|
for x in "$@" ; do
|
||||||
if isJavaConfig "$x" ; then
|
if [[ $x == -* ]] ; then
|
||||||
cmdvDebug rmdir "$@"
|
switch="$switch $x"
|
||||||
|
elif isJavaConfig "$x" ; then
|
||||||
|
cmdvDebug rmdir $switch "$x"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
@ -55,7 +61,11 @@ rmdirDebug() {
|
|||||||
#we should be pretty strict about removing once used (even "used" [with fail]) config file, as it may corrupt another installation
|
#we should be pretty strict about removing once used (even "used" [with fail]) config file, as it may corrupt another installation
|
||||||
clean(){
|
clean(){
|
||||||
debug "cleanup: removing $config"
|
debug "cleanup: removing $config"
|
||||||
rmDebug -rf $config
|
if [ "x$debug" == "xtrue" ] ; then
|
||||||
|
rm -rf $config -v
|
||||||
|
else
|
||||||
|
rm -rf $config 1>/dev/null 2>&1
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
if [ "x" == "x$config" ] ; then
|
if [ "x" == "x$config" ] ; then
|
||||||
|
Loading…
Reference in New Issue
Block a user