From 58a6e07abb9791b0034291c1452083feefe1303b Mon Sep 17 00:00:00 2001
From: Xmetalfanx <Xmetalfanx@yahoo.com>
Date: Tue, 26 Jul 2022 16:29:14 -0400
Subject: [PATCH] Strawberry code update for Ubuntu

---
 .../software/multimedia/f_strawberry.cfg      | 35 +++++--------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/functions/universal/software/multimedia/f_strawberry.cfg b/functions/universal/software/multimedia/f_strawberry.cfg
index 2758580c..afa8d4ab 100644
--- a/functions/universal/software/multimedia/f_strawberry.cfg
+++ b/functions/universal/software/multimedia/f_strawberry.cfg
@@ -9,8 +9,7 @@
 
 
 ######################################################333
-function getStrawberryURL()
-{
+function getStrawberryURL() {
   # $1 is used to determine what package to download
 
   strawberryURLBase="https://github.com/"
@@ -37,8 +36,7 @@ function downloadIfStrawberryVarExists() {
 #####################################
 
 
-function strawberryAppImage
-{
+function strawberryAppImage() {
 
   getStrawberryURL "AppImage"
 
@@ -47,8 +45,7 @@ function strawberryAppImage
 }
 
 # For Debian
-function strawberryDebian()
-{
+function strawberryDebian() {
   case $debianBranch in
 
     buster|oldstable) getStrawberryURL buster ;;
@@ -65,8 +62,7 @@ function strawberryDebian()
 
 }
 
-function strawberryFedora()
-{
+function strawberryFedora() {
     case $fedoraVersion in
     	35) getStrawberryURL fc35 ;;
       34) getStrawberryURL fc34 ;;
@@ -76,10 +72,8 @@ function strawberryFedora()
     downloadIfStrawberryVarExists
 }
 
-
 # OpenSuse Leap (nothing listed for TW ... maybe in the TW repos )
-function strawberryOpensuse()
-{
+function strawberryOpensuse() {
 
     if [ "$openSUSEBranch" = "leap" ]; then
 
@@ -97,21 +91,6 @@ function strawberryOpensuse()
     fi
 }
 
-
-
-# For Ubuntu
-function strawberryUbuntu()
-{
-  case $OSRELEASE_UBUNTU_CODENAME in
-    bionic|focal|jammy) getStrawberryURL $OSRELEASE_UBUNTU_CODENAME ;;
-  esac
-
-  downloadIfStrawberryVarExists
-  
-}
-
-
-
 #################################################################################
 # Meta function
 function installStrawberry()
@@ -120,6 +99,8 @@ function installStrawberry()
   programTitle="Strawberry Media Player"
   programHomepage="https://www.strawberrymusicplayer.org/"
 
+  PPASource=""
+
   clear
   echo -e "Installing $programTitle"
 
@@ -129,7 +110,7 @@ function installStrawberry()
     debian) strawberryDebian $debianBranch ;;
     fedora) strawberryFedora ;;
     opensuse) strawberryOpensuse ;;
-    ubuntu) strawberryUbuntu ;;
+    ubuntu) installStrawberryPPA ;;
 
     *) echo -e "Distro base can not be detected, Strawberry Music Player was not installed"
 		return ;;