1.5.3 release

installJRMC

@@ -18,7 +18,7 @@
 # * Be careful with tabs in heredocs
 shopt -s extglob
 
-declare -g SCRIPT_VERSION="1.5.2"
+declare -g SCRIPT_VERSION="1.5.3"
 declare -g MC_REPO="bullseye" # should match the MC_VERSION
 # declare -g MC_REPO="bookworm" # should match the MC_VERSION
 declare -g MC_VERSION="33.0.72" # do find all replace
@@ -1569,13 +1569,16 @@ uninstall() {
   echo "Uninstalling JRiver Media Center package"
   if "${PKG_REMOVE[@]}" "${MC_PKG%%=*}"; then # remove version specifier
     echo "JRiver Media Center has been completely uninstalled"
-    echo "To remove your MC library: rm -rf $HOME/.jriver"
   elif [[ $? -eq 100 ]]; then
     err "JRiver Media Center package '${MC_PKG%%=*}' is not present and was not uninstalled"
   else
     err "Could not remove Media Center package"
   fi
 
+  echo "Uninstalling JRiver Media Center GPG key"
+  local keyfile="/usr/share/keyrings/jriver-com-archive-keyring.gpg"
+  [[ -f $keyfile ]] && execute sudo rm -f "$keyfile"
+
   if [[ -f $SCRIPT_DIR/.uninstall ]]; then
     echo "Removing files from .uninstall log"
     while read -r p; do
@@ -1584,6 +1587,7 @@ uninstall() {
     mv "$SCRIPT_DIR/.uninstall" "$SCRIPT_DIR/.uninstall.bk"
   fi
 
+  echo "To remove your MC library: rm -rf $HOME/.jriver"
   return 0
 }
 
@@ -1775,6 +1779,7 @@ execute() {
   fi
 }
 download() {
+  debug "Running: ${FUNCNAME[0]} $*"
   local url="$1"
   local output="${2:-}"
   local -a cmd
@@ -1788,13 +1793,14 @@ download() {
     fi
   elif command -v wget &>/dev/null || install_package --silent wget; then
     cmd=(wget --quiet)
-    [[ -n "$output" ]] && cmd+=(--output-document="$output")
+    [[ -n "$output" ]] && cmd+=("--output-document=$output")
   else
     err "Unable to install wget or curl"
     return 1
   fi
 
-  execute "${cmd[@]}" "$url"
+  debug "${cmd[@]}" "$url"
+  "${cmd[@]}" "$url"
 }
 
 # Roughly turn debugging on for pre-init