From 45b7b3076e8d4910210424c6e8b43f5d738a9860 Mon Sep 17 00:00:00 2001
From: "Francois B. (Makoto)" <francois@makotonoblog.be>
Date: Sun, 24 May 2020 20:16:08 +0200
Subject: [PATCH] audacity repo added + moving remove useless flatpak in
 toolAutoremove (-p option)

---
 core_functions.sh        |  6 ------
 repo_functions_ub1804.sh | 10 +++++++++-
 repo_functions_ub2004.sh | 10 +++++++++-
 tools_functions.sh       |  4 +++-
 yggdrasil.sh             |  1 +
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/core_functions.sh b/core_functions.sh
index 4592591..5399785 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -194,12 +194,6 @@ function updateSystem () {
     sudo flatpak update -y &>> $logFile
     ret_code=$?
     retCode $ret_code
-
-    printf "[FLATPAK] uninstall --unused "
-    printf "\n[FLATPAK] uninstall --unused\n" &>> $logFile
-    sudo flatpak uninstall --unused -y &>> $logFile
-    ret_code=$?
-    retCode $ret_code
   fi
 
   repoAdded=0
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index 352c11a..915137f 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -525,7 +525,15 @@ flatpak;addRepo_flatpak
 balena-etcher-electron;addRepo_Belena
 font-manager;addRepo_FontManager
 cawbird;addRepo_Cawbird
-ubuntu-make;addRepo_UbuntuMake"
+ubuntu-make;addRepo_UbuntuMake
+audacity;addRepo_Audacity"
+
+#
+# Audacity
+#
+function addRepo_Audacity () {
+  addPPA ppa:ubuntuhandbook1/audacity
+}
 
 #
 # Ubuntu Make
diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh
index 03e9b9d..7420b93 100644
--- a/repo_functions_ub2004.sh
+++ b/repo_functions_ub2004.sh
@@ -471,7 +471,8 @@ handbrake-cli;addRepo_Handbrake
 handbrake;addRepo_Handbrake
 kodi;addRepo_Kodi
 avidemux;addRepo_Avidemux
-winehq-stable;addRepo_WineHQ"
+winehq-stable;addRepo_WineHQ
+audacity;addRepo_Audacity"
 
 #TODO : no focal support yet / or not needed yet
 #woeusb;addRepo_Webupd8
@@ -491,6 +492,13 @@ winehq-stable;addRepo_WineHQ"
 #ubuntu-make;addRepo_UbuntuMake
 #flatpak;addRepo_flatpak
 
+#
+# Audacity
+#
+function addRepo_Audacity () {
+  addPPA ppa:ubuntuhandbook1/audacity
+}
+
 #
 # Ubuntu Make #TODO : no focal support yet
 #
diff --git a/tools_functions.sh b/tools_functions.sh
index 20a46e6..52afd4c 100644
--- a/tools_functions.sh
+++ b/tools_functions.sh
@@ -106,7 +106,9 @@ function toolPacketLoss () {
 #
 function toolAutoremove () {
   runCmd "sudo apt-get -y autoremove" \
-         "removing not necessary dependencies"
+         "removing useless APT dependencies"
+  runCmd "sudo flatpak uninstall --unused -y" \
+         "removing useless FLATPAK dependencies"
 }
 
 #
diff --git a/yggdrasil.sh b/yggdrasil.sh
index 1ace2cb..a097f53 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -248,6 +248,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do
       exit
       ;;
     p)
+      msg "Removing useless dependencies"
       toolAutoremove
       exit
       ;;