From a388f23a906e7730c4181e5e709bffd86146ed0f Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Mon, 3 Oct 2022 18:56:35 +0200
Subject: [PATCH] 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
---
 copy_jdk_configs_fixFiles.sh | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/copy_jdk_configs_fixFiles.sh b/copy_jdk_configs_fixFiles.sh
index 0e4ce9f..2e5d603 100755
--- a/copy_jdk_configs_fixFiles.sh
+++ b/copy_jdk_configs_fixFiles.sh
@@ -37,17 +37,23 @@ mvDebug() {
 }
 
 rmDebug() {
+  local switch=""
   for x in "$@" ; do 
-    if isJavaConfig "$x" ; then
-      cmdvDebug rm "$@"
+    if [[ $x == -* ]] ; then
+      switch="$switch $x"
+    elif isJavaConfig "$x" ; then
+      cmdvDebug rm $switch "$x"
     fi
   done
 }
 
 rmdirDebug() {
+  local switch=""
   for x in "$@" ; do 
-    if isJavaConfig "$x" ; then
-      cmdvDebug rmdir "$@"
+    if [[ $x == -* ]] ; then
+      switch="$switch $x"
+    elif isJavaConfig "$x" ; then
+      cmdvDebug rmdir $switch "$x"
     fi
   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
 clean(){
   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