Merge pull request #4554 from RedisInsight/RI-6690-testing-debian-updates

Ri-6690 - Redis Insight client v2.66 installed with the deb package fails to upgrade to a newer version (2.67) on Ububntu && RI-6691 - After client update 2.64 to 2.67 Redis Insight can't be started from the application icon

Author: Kristiyan Ivanov

scripts/deb-after-install.sh

@@ -1,31 +1,107 @@
 #!/bin/bash
-set -ex
+set -e
 
-# Define paths
-OLD_INSTALL_PATH="/opt/Redis Insight"  # Path with space
-NEW_INSTALL_PATH="/opt/redisinsight"   # New path without space
+OLD_INSTALL_PATH="/opt/Redis Insight"
+NEW_INSTALL_PATH="/opt/redisinsight"
 DESKTOP_FILE="/usr/share/applications/redisinsight.desktop"
 
-# Check if old directory exists and rename it
-if [ -d "$OLD_INSTALL_PATH" ]; then
-    echo "Renaming $OLD_INSTALL_PATH to $NEW_INSTALL_PATH"
-    sudo mv "$OLD_INSTALL_PATH" "$NEW_INSTALL_PATH"
-fi
 
-# Update desktop file to use new path
+echo "Checking for running RedisInsight instances..."
+RUNNING_PIDS=$(pgrep -f "$NEW_INSTALL_PATH/redisinsight" || pgrep -f "$OLD_INSTALL_PATH/redisinsight" || true)
+
+OUR_PID=$$
+for PID in $RUNNING_PIDS; do
+    if ! ps -o pid= --ppid $OUR_PID | grep -q $PID; then
+        echo "Found running RedisInsight instance (PID: $PID), attempting to terminate..."
+        kill $PID 2>/dev/null || true
+    fi
+done
+
+# Brief pause to let processes terminate
+sleep 1
+
 if [ -f "$DESKTOP_FILE" ]; then
-    echo "Updating desktop file to use new path"
-    sudo sed -i "s|$OLD_INSTALL_PATH|$NEW_INSTALL_PATH|g" "$DESKTOP_FILE"
+    echo "Updating desktop file for launcher compatibility..."
+
+    # First replace the old path with the new path throughout the file
+    sed -i "s|$OLD_INSTALL_PATH|$NEW_INSTALL_PATH|g" "$DESKTOP_FILE" || true
+
+    # Then ensure the Exec line is properly formatted without quotes
+    sed -i "s|^Exec=.*|Exec=$NEW_INSTALL_PATH/redisinsight %U|g" "$DESKTOP_FILE" || true
+
+    # Update desktop database to refresh the icon
+    update-desktop-database 2>/dev/null || true
 fi
 
-# Update binary link
-sudo ln -sf "$NEW_INSTALL_PATH/redisinsight" "/usr/bin/redisinsight"
+# Handle update case: redisinsight exists, Redis Insight exists too
+# This means that we are in an update scenario
+if [ -d "$NEW_INSTALL_PATH" ] && [ -d "$OLD_INSTALL_PATH" ]; then
+    echo "Both old and new paths exist - handling update scenario"
+
+    cp -rf "$OLD_INSTALL_PATH"/* "$NEW_INSTALL_PATH"/ || true
+
+    rm -rf "$OLD_INSTALL_PATH" || true
+
+    # Ensure binary link and permissions
+    ln -sf "$NEW_INSTALL_PATH/redisinsight" "/usr/bin/redisinsight" || true
+    if [ -f "$NEW_INSTALL_PATH/redisinsight" ]; then
+        chmod +x "$NEW_INSTALL_PATH/redisinsight" || true
+    fi
+    if [ -f "$NEW_INSTALL_PATH/chrome-sandbox" ]; then
+        chown root:root "$NEW_INSTALL_PATH/chrome-sandbox" || true
+        chmod 4755 "$NEW_INSTALL_PATH/chrome-sandbox" || true
+    fi
+
+    echo "Update handled successfully"
+    exit 0
+fi
+
+# Handle simple auto-update case: only redisinsight exists
+if [ -d "$NEW_INSTALL_PATH" ] && [ ! -d "$OLD_INSTALL_PATH" ]; then
+    echo "New path exists but old doesn't - likely clean install or auto-update"
+
+    # Ensure binary link and permissions
+    ln -sf "$NEW_INSTALL_PATH/redisinsight" "/usr/bin/redisinsight" || true
+    if [ -f "$NEW_INSTALL_PATH/redisinsight" ]; then
+        chmod +x "$NEW_INSTALL_PATH/redisinsight" || true
+    fi
+    if [ -f "$NEW_INSTALL_PATH/chrome-sandbox" ]; then
+        chown root:root "$NEW_INSTALL_PATH/chrome-sandbox" || true
+        chmod 4755 "$NEW_INSTALL_PATH/chrome-sandbox" || true
+    fi
+
+    echo "Installation/update completed successfully"
+    exit 0
+fi
+
+# Handle migration case: only Redis Insight exists.
+#This is to ensure that if somebody updates from a very old version to a newer one, we'll still migrate it as expected
+if [ ! -d "$NEW_INSTALL_PATH" ] && [ -d "$OLD_INSTALL_PATH" ]; then
+    echo "Old path found but new doesn't exist - migrating to new path"
+
+    # Simply move the directory
+    mv "$OLD_INSTALL_PATH" "$NEW_INSTALL_PATH" || true
+
+    # Ensure binary link and permissions
+    ln -sf "$NEW_INSTALL_PATH/redisinsight" "/usr/bin/redisinsight" || true
+    if [ -f "$NEW_INSTALL_PATH/redisinsight" ]; then
+        chmod +x "$NEW_INSTALL_PATH/redisinsight" || true
+    fi
+    if [ -f "$NEW_INSTALL_PATH/chrome-sandbox" ]; then
+        chown root:root "$NEW_INSTALL_PATH/chrome-sandbox" || true
+        chmod 4755 "$NEW_INSTALL_PATH/chrome-sandbox" || true
+    fi
+
+    echo "Migration completed successfully"
+    exit 0
+fi
 
-# Set basic executable permissions
-sudo chmod +x "$NEW_INSTALL_PATH/redisinsight"
+# Neither directory exists - unexpected state
+echo "Neither old nor new path exists. This is an unexpected state."
+echo "Creating new installation directory as a fallback"
+mkdir -p "$NEW_INSTALL_PATH" || true
 
-# Set correct ownership and permissions for chrome-sandbox
-sudo chown root:root "$NEW_INSTALL_PATH/chrome-sandbox"
-sudo chmod 4755 "$NEW_INSTALL_PATH/chrome-sandbox"
+# Always set up the binary link
+ln -sf "$NEW_INSTALL_PATH/redisinsight" "/usr/bin/redisinsight" || true
 
-echo "RedisInsight post-installation setup completed successfully"
+echo "Post-installation completed with warnings"