From e4557335bde3dffbf3d13d18cd3f65dd166746c4 Mon Sep 17 00:00:00 2001
From: Cyrille L <echolib@a-lec.org>
Date: Wed, 23 Mar 2022 17:25:51 +0100
Subject: [PATCH] Fix: setup (testing)

---
 setup.sh                  | 11 ++++++++---
 usr/local/bin/upd         |  2 +-
 var/lib/upd/scripts/check |  1 -
 var/lib/upd/setup.sh      | 11 ++++++++---
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/setup.sh b/setup.sh
index d3b2ab4..6c21ef4 100644
--- a/setup.sh
+++ b/setup.sh
@@ -67,25 +67,30 @@ do
   sudo mkdir -p "$setup_folder" \
     && cmd_res="$?" \
     && setup__check_err
+
   echo -ne "  Owner $setup_user:"
   sudo chown -R "$setup_user":"$setup_user" "$setup_folder" \
     && cmd_res="$?" \
     && setup__check_err
-  sudp cp -rf "$setup_folder" \
+
+  sudp cp -rf "${PWD}$setup_folder/*" "$setup_folder" \
     && cmd_res="$?" \
     && setup__check_err
 done
+
 echo "- Folder: $setup_dir_bin"
 echo -ne "  Created:"
 sudo mkdir -p "$setup_dir_bin" \
   && cmd_res="$?" \
-  && setup__check_err 
+  && setup__check_err
+  
 echo "- File: $setup_file_bin"
 echo -ne "  Owner $setup_user:"
 sudo chown "$setup_user":"$setup_user" "$set_bin_uri" \
   && cmd_res="$?" \
   && setup__check_err
-echo -ne "  Copy:"
+
+echo -ne "  Copy $PWD$set_bin_uri:"
 sudo cp -f "$PWD$set_bin_uri" \
            "$set_bin_uri" \
   && cmd_res="$?" \
diff --git a/usr/local/bin/upd b/usr/local/bin/upd
index 5f8b90c..4af09c6 100755
--- a/usr/local/bin/upd
+++ b/usr/local/bin/upd
@@ -1,5 +1,5 @@
 #!/bin/bash
-# version: 0.0.2
+# version: 0.0.3
 # file: upd
 # Folder: /usr/local/bin
 # By echolib
diff --git a/var/lib/upd/scripts/check b/var/lib/upd/scripts/check
index 092fd73..ecfe859 100644
--- a/var/lib/upd/scripts/check
+++ b/var/lib/upd/scripts/check
@@ -64,7 +64,6 @@ case "$arch" in
 esac
 
 C_NBR=${C_Green}
-upd_nbr=0
 upd_nbr=`cat "$upd_file_check" | wc -l`
 (( $upd_nbr > 0 )) \
   && C_NBR=${C_Yellow} \
diff --git a/var/lib/upd/setup.sh b/var/lib/upd/setup.sh
index d3b2ab4..6c21ef4 100644
--- a/var/lib/upd/setup.sh
+++ b/var/lib/upd/setup.sh
@@ -67,25 +67,30 @@ do
   sudo mkdir -p "$setup_folder" \
     && cmd_res="$?" \
     && setup__check_err
+
   echo -ne "  Owner $setup_user:"
   sudo chown -R "$setup_user":"$setup_user" "$setup_folder" \
     && cmd_res="$?" \
     && setup__check_err
-  sudp cp -rf "$setup_folder" \
+
+  sudp cp -rf "${PWD}$setup_folder/*" "$setup_folder" \
     && cmd_res="$?" \
     && setup__check_err
 done
+
 echo "- Folder: $setup_dir_bin"
 echo -ne "  Created:"
 sudo mkdir -p "$setup_dir_bin" \
   && cmd_res="$?" \
-  && setup__check_err 
+  && setup__check_err
+  
 echo "- File: $setup_file_bin"
 echo -ne "  Owner $setup_user:"
 sudo chown "$setup_user":"$setup_user" "$set_bin_uri" \
   && cmd_res="$?" \
   && setup__check_err
-echo -ne "  Copy:"
+
+echo -ne "  Copy $PWD$set_bin_uri:"
 sudo cp -f "$PWD$set_bin_uri" \
            "$set_bin_uri" \
   && cmd_res="$?" \