chore: Update Conda setup script path and log messages

Author: codeperfectplus

cronjob.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Define the cron job command
+username=$(whoami)
+log_dir="/home/$username/logs"
+mkdir -p "$log_dir"
+CRON_JOB="* * * * * /bin/bash $(pwd)/dashboard.sh >> $log_dir/systemdashboard_cron.log 2>&1"
+
+echo "Total cron jobs before: $(crontab -l | grep -v '^#' | wc -l)"
+
+# Add the cron job to the crontab
+(crontab -l 2>/dev/null; echo "$CRON_JOB") | crontab -
+
+echo "Cron job added: $CRON_JOB"
+
+# show all cron jobs ignoring comments and empty lines
+
+echo "Total cron jobs after: $(crontab -l | grep -v '^#' | wc -l)"
+
+
+

dashboard.sh

@@ -1,28 +1,42 @@
 #!/bin/bash
 
+# Function to log messages with timestamps
+log_message() {
+    echo "$(date +'%Y-%m-%d %H:%M:%S') - $1" >> "$LOG_FILE"
+}
+
 # Determine the directory where this script is located
-SCRIPT_DIR="$(dirname "$(realpath "$0")")"
+SCRIPT_DIR="$(dirname "$(realpath "$0" 2>/dev/null || readlink -f "$0")")"
 
 # Define variables for paths relative to the script's directory
 FLASK_APP_PATH="${FLASK_APP_PATH:-$SCRIPT_DIR/app.py}"
 REQUIREMENTS_FILE="${REQUIREMENTS_FILE:-$SCRIPT_DIR/requirements.txt}"
 FLASK_PORT="${FLASK_PORT:-5050}"
 LOG_FILE="${SCRIPT_DIR}/my_script.log"
 USERNAME="$(whoami)"
-CONDA_PATH="/home/$USERNAME/miniconda3"
 
-# Find the Conda setup script dynamically
-if [ -z "$CONDA_PATH" ]; then
-    echo "Conda not found in PATH. Ensure Conda is installed and added to PATH." >> "$LOG_FILE"
+# Check for Miniconda3 and Anaconda3
+CONDA_PATHS=("/home/$USERNAME/miniconda3" "/home/$USERNAME/anaconda3")
+CONDA_FOUND=false
+
+for CONDA_PATH in "${CONDA_PATHS[@]}"; do
+    if [ -d "$CONDA_PATH" ]; then
+        CONDA_FOUND=true
+        break
+    fi
+done
+
+if [ "$CONDA_FOUND" = false ]; then
+    log_message "Neither Miniconda3 nor Anaconda3 found. Ensure Conda is installed."
     exit 1
 fi
 
 # Derive the path to the Conda setup script
-CONDA_SETUP_SCRIPT="/home/$USERNAME/miniconda3/etc/profile.d/conda.sh"
+CONDA_SETUP_SCRIPT="$CONDA_PATH/etc/profile.d/conda.sh"
 
 # Check if Conda setup script exists
 if [ ! -f "$CONDA_SETUP_SCRIPT" ]; then
-    echo "Conda setup script not found at $CONDA_SETUP_SCRIPT" >> "$LOG_FILE"
+    log_message "Conda setup script not found at $CONDA_SETUP_SCRIPT."
     exit 1
 fi
 
@@ -34,34 +48,34 @@ CONDA_ENV_NAME="systemdashboard"
 
 # Check if the Conda environment exists and create it if not
 if ! conda env list | grep -q "$CONDA_ENV_NAME"; then
-    echo "Conda environment '$CONDA_ENV_NAME' not found. Creating it..." >> "$LOG_FILE"
+    log_message "Conda environment '$CONDA_ENV_NAME' not found. Creating it..."
     conda create -n "$CONDA_ENV_NAME" python=3.10 -y
-    echo "Activating Conda environment '$CONDA_ENV_NAME'" >> "$LOG_FILE"
+    log_message "Activating Conda environment '$CONDA_ENV_NAME'."
     conda activate "$CONDA_ENV_NAME"
-    echo "Installing required packages" >> "$LOG_FILE"
+    log_message "Installing required packages."
     pip install -r "$REQUIREMENTS_FILE"
 else
-    echo "Activating existing Conda environment '$CONDA_ENV_NAME'" >> "$LOG_FILE"
+    log_message "Activating existing Conda environment '$CONDA_ENV_NAME'."
     conda activate "$CONDA_ENV_NAME"
 fi
 
 # Continue with the rest of your script
-echo "Conda environment '$CONDA_ENV_NAME' is active." >> "$LOG_FILE"
+log_message "Conda environment '$CONDA_ENV_NAME' is active."
 
 # Export Flask environment variables
 export FLASK_APP="$FLASK_APP_PATH"
 export FLASK_ENV=development  # or production
 
 # Check if Flask app is running
 if ! pgrep -f "flask run --host=0.0.0.0 --port=$FLASK_PORT" > /dev/null; then
-    # git pull on FLASK_APP_PATH directory
+    # git pull in FLASK_APP_PATH directory
     current_dir=$(pwd)
-    cd $SCRIPT_DIR
+    cd "$SCRIPT_DIR"
     git stash && git pull
-    cd $current_dir
+    cd "$current_dir"
 
-    echo "Starting Flask app..." >> "$LOG_FILE"
+    log_message "Starting Flask app..."
     flask run --host=0.0.0.0 --port="$FLASK_PORT" &
 else
-    echo "Flask app is already running." >> "$LOG_FILE"
+    log_message "Flask app is already running."
 fi