Refactoring

Author: martacarbone

debian/Dockerfile

@@ -43,6 +43,11 @@ RUN apt-get update && apt-get install -y sed
 COPY ./debian/${DEB_NAME} /${DEB_NAME}/
 COPY --from=go /app/${BINARY_NAME} /${DEB_NAME}/usr/bin/${BINARY_NAME}
 
+RUN (cd /${DEB_NAME}/DEBIAN && \
+  sed -e '/# SHARED_FUNCTIONS/r helper_func.sh' ./prerm > prerm.tmp && mv prerm.tmp ./prerm && \
+  sed -e '/# SHARED_FUNCTIONS/r helper_func.sh' ./preinst > preinst.tmp && mv preinst.tmp ./preinst &&\
+  chmod a+x ./prerm ./preinst)
+
 # Go application are tagged with `v` prefix, this remove the first v if present
 RUN export VERSION=$(echo "${VERSION}" | sed -e "s/^v\(.*\)/\1/") && \
   sed -i "s/\$ARCH/${ARCH}/" /${DEB_NAME}/DEBIAN/control && \

debian/arduino-app-cli/DEBIAN/helper_func.sh

@@ -0,0 +1,30 @@
+# Function: cleanup_arduino_examples
+# Description: Stops running Arduino apps within example directories and
+#              removes associated cache files, but only if the root 
+#              examples directory exists.
+#
+# Arguments:
+#   $1 - The path to the root examples directory (EXAMPLES_DIR).
+#
+cleanup_arduino_examples() {
+    local EXAMPLES_DIR="$1"
+    
+    if [ -d "${EXAMPLES_DIR}" ]; then
+        local EXAMPLES=$(find "${EXAMPLES_DIR}" -maxdepth 1 -mindepth 1 -type d 2>/dev/null)
+        echo "Stopping apps and clearing cache in: ${EXAMPLES_DIR}"
+        for dir_path in ${EXAMPLES}; do
+            echo "  -> Stopping app/removing cache in: ${dir_path}"
+            
+            # 1. Stop the application (suppress output and errors)
+            sudo -u arduino /usr/bin/arduino-app-cli app stop "${dir_path}" > /dev/null 2>&1 || true
+            
+            # 2. Remove the cache directory
+            local CACHE_PATH="${dir_path}/.cache"
+            
+            # Check if the cache directory exists before attempting to remove it
+            if [ -d "${CACHE_PATH}" ]; then
+                rm -r "${CACHE_PATH}"
+            fi
+        done
+    fi
+}

debian/arduino-app-cli/DEBIAN/preinst

@@ -24,20 +24,16 @@ if ! getent group "$SYSUPGRADE_GROUP" >/dev/null 2>&1; then
 fi
 usermod -aG "$SYSUPGRADE_GROUP" "$APP_USER"
 
-delete_obsolete_files() {
-  OBSOLETE_DIR="/home/arduino/.local/share/arduino-app-cli/examples"
-    for i in "${OBSOLETE_DIR}"/*; do
-      rm -rf "${i}"/.cache;
-    done
-}
+
+# SHARED_FUNCTIONS
 
 if [ "$1" = "upgrade" ]; then
   # if $2 is not empty, this is an upgrade
   if [ -n "$2" ]; then
     # check if this is an upgrade from an old version
     if dpkg --compare-versions "$2" lt "0.9.0"; then
-        echo "Running pre-0.8.0 legacy cleanup/migration..."
-        delete_obsolete_files
+        echo "Running pre-0.9.0 legacy cleanup/migration..."
+        cleanup_arduino_examples /home/arduino/.local/share/arduino-app-cli/examples
     fi
   fi
 fi

debian/arduino-app-cli/DEBIAN/prerm

@@ -5,39 +5,9 @@ systemctl disable arduino-app-cli
 systemctl disable arduino-burn-bootloader
 systemctl disable arduino-avahi-serial.service
 
-# Function: cleanup_arduino_examples
-# Description: Stops running Arduino apps within example directories and
-#              removes associated cache files, but only if the root 
-#              examples directory exists.
-#
-# Arguments:
-#   $1 - The path to the root examples directory (EXAMPLES_DIR).
-#
-cleanup_arduino_examples() {
-    local EXAMPLES_DIR="$1"
-    
-    if [ -d "${EXAMPLES_DIR}" ]; then
-        local EXAMPLES=$(find "${EXAMPLES_DIR}" -maxdepth 1 -mindepth 1 -type d 2>/dev/null)
-        echo "Stopping apps and clearing cache in: ${EXAMPLES_DIR}"
-        for dir_path in ${EXAMPLES}; do
-            
-            # 1. Stop the application (suppress output and errors)
-            echo "  -> Stopping app in: ${dir_path}"
-            sudo -u arduino /usr/bin/arduino-app-cli app stop "${dir_path}" > /dev/null 2>&1 || true
-            
-            # 2. Remove the cache directory
-            local CACHE_PATH="${dir_path}/.cache"
-            
-            # Check if the cache directory exists before attempting to remove it
-            if [ -d "${CACHE_PATH}" ]; then
-                echo "  -> Removing cache: ${CACHE_PATH}"
-                rm -r "${CACHE_PATH}"
-            fi
-        done
-    fi
-}
+# SHARED_FUNCTIONS
 
-# Remove .cache located in packages prev to 0.9.0
+echo "Running pre-0.8.0 legacy cleanup/migration..."
 cleanup_arduino_examples /home/arduino/.local/share/arduino-app-cli/examples
-# Remove .cache for the current package 
+echo "Cache cleanup..."
 cleanup_arduino_examples /var/lib/arduino-app-cli/examples