From d62f8443718d93cf0c248691969bbc8e3b3ab4b3 Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Fri, 11 Jul 2025 20:55:24 -0400
Subject: [PATCH] Fix bad .jriver permissions more gracefully

---
 installJRMC | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/installJRMC b/installJRMC
index 0c747c6..06c3440 100755
--- a/installJRMC
+++ b/installJRMC
@@ -21,7 +21,7 @@
 # shellcheck disable=SC2317
 shopt -s extglob
 
-declare -g SCRIPT_VERSION="1.34.4-dev"
+declare -g SCRIPT_VERSION="1.34.4"
 declare -g MC_VERSION="34.0.42" # do find all replace (hardcoded fallback)
 declare -g MC_REPO="bookworm" # should match the MC_VERSION
 declare -g BOARD_ID="89.0" # MC34 board ID for automatic version detection
@@ -1590,9 +1590,15 @@ service_jriver-createrepo() {
 fix_dotjriver_permissions() {
   debug "${FUNCNAME[0]}()"
 
-  # Ensure the user owns the .jriver directory
-  [[ -d "$HOME/.jriver" ]] && execute sudo chown -R "$USER:$USER" "$HOME/.jriver"
-
+  # Ensure the user owns their .jriver directory
+  if [[ -d "$HOME/.jriver" ]]; then
+    local owner
+    owner=$(stat -c '%U' "$HOME/.jriver")
+    if [[ "$owner" != "$USER" ]]; then
+      ask_ok "$USER does not currently own $HOME/.jriver, attempt fix?" &&
+      execute sudo chown -R "$USER:$USER" "$HOME/.jriver"
+    fi
+  fi
 }
 
 # @description Completely uninstalls MC, services, and firewall rules