fixed: init.sh & obdiag_backup.sh (oceanbase#649)

* Rename Dockerfile to DockerFile * fixed: init.sh & obdiag_backup.sh
Teingi · Dec 23, 2024 · 5f8cc82 · 5f8cc82
1 parent c138ef3
commit 5f8cc82
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/rpm/init.sh b/rpm/init.sh
@@ -20,7 +20,7 @@ mkdir -p ${OBDIAG_HOME}/log
 mkdir -p ${OBDIAG_HOME}/display
 
 # Clean rca old *scene.py files
-find ${OBDIAG_HOME}/rca -maxdepth 1 -name "*_scene.py" -type f -exec rm -f {} \;
+find ${OBDIAG_HOME}/rca -maxdepth 1 -name "*_scene.py" -type f -exec rm -f {} + 2>/dev/null
 
 cp -rf ${WORK_DIR}/plugins/*  ${OBDIAG_HOME}/
 

diff --git a/rpm/obdiag_backup.sh b/rpm/obdiag_backup.sh
@@ -1,8 +1,21 @@
 #!/bin/bash
 
+CURRENT_USER_ID=$(id -u)
+CURRENT_USER_NAME=$(logname 2>/dev/null || echo "$SUDO_USER" | awk -F'[^a-zA-Z0-9_]' '{print $1}')
+
+if [ "$CURRENT_USER_ID" -eq 0 ]; then
+    if [ -n "$SUDO_USER" ]; then
+        USER_HOME=$(getent passwd "$SUDO_USER" | cut -d: -f6)
+    else
+        USER_HOME=/root
+    fi
+else
+    USER_HOME="$HOME"
+fi
+
 # Define source directory and target backup directory
-SOURCE_DIR=~/.obdiag/
-BACKUP_DIR=~/.obdiag/backup/
+SOURCE_DIR="$USER_HOME/.obdiag/"
+BACKUP_DIR="$USER_HOME/.obdiag/backup/"
 
 # Ensure the backup directory exists, create it if it does not
 mkdir -p "$BACKUP_DIR"