Fix comments

Author: ben-kaufman

.tx/config

@@ -5,4 +5,4 @@ host = https://app.transifex.com
 file_filter = app/src/main/res/values-<lang>/strings.xml
 source_file = app/src/main/res/values/strings.xml
 source_lang = en
-type = ANDROID
+type = ANDROID

scripts/pull-translations.sh

@@ -4,27 +4,99 @@
 
 set -e
 
-RES_DIR="app/src/main/res"
+# Validate script is run from project root
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+RES_DIR="$PROJECT_ROOT/app/src/main/res"
+
+if [ ! -d "$RES_DIR" ]; then
+    echo "Error: Resource directory not found: $RES_DIR"
+    echo "Please run this script from the project root directory."
+    exit 1
+fi
+
+if [ ! -f "$PROJECT_ROOT/.tx/config" ]; then
+    echo "Error: Transifex config not found: $PROJECT_ROOT/.tx/config"
+    echo "Please ensure Transifex is configured for this project."
+    exit 1
+fi
 
 # Helper function to rename or merge directories
 rename_or_merge() {
     local src="$1"
     local dst="$2"
     local src_name=$(basename "$src")
     local dst_name=$(basename "$dst")
+    local merge_errors=0
+    
+    if [ ! -d "$src" ]; then
+        echo "  Warning: Source directory does not exist: $src_name"
+        return 1
+    fi
 
     if [ ! -d "$dst" ]; then
         echo "  Renaming: $src_name -> $dst_name"
-        mv "$src" "$dst" && return 0
+        if mv "$src" "$dst"; then
+            return 0
+        else
+            echo "  Error: Failed to rename $src_name to $dst_name"
+            return 1
+        fi
     else
         echo "  Merging: $src_name -> $dst_name"
-        find "$src" -mindepth 1 -maxdepth 1 -exec mv {} "$dst/" \; 2>/dev/null || true
-        rmdir "$src" 2>/dev/null && return 0 || return 1
+        while IFS= read -r -d '' item; do
+            if ! mv "$item" "$dst/" 2>/dev/null; then
+                echo "  Warning: Failed to move $(basename "$item") from $src_name"
+                merge_errors=$((merge_errors + 1))
+            fi
+        done < <(find "$src" -mindepth 1 -maxdepth 1 -print0 2>/dev/null)
+        
+        # Only remove source directory if merge was successful
+        if [ "$merge_errors" -eq 0 ]; then
+            if rmdir "$src" 2>/dev/null; then
+                return 0
+            else
+                echo "  Warning: Could not remove empty directory: $src_name"
+                return 1
+            fi
+        else
+            echo "  Error: Some files could not be merged from $src_name"
+            return 1
+        fi
     fi
 }
 
+# Validate XML file is well-formed before processing
+validate_xml() {
+    local file="$1"
+    # Basic validation: check for opening and closing resources tags
+    if ! grep -q '<resources' "$file" 2>/dev/null || ! grep -q '</resources>' "$file" 2>/dev/null; then
+        echo "  Warning: $file appears to be malformed XML, skipping normalization"
+        return 1
+    fi
+    return 0
+}
+
 echo "Pulling translations from Transifex..."
+
+# Check if tx command is available
+if ! command -v tx &> /dev/null; then
+    echo "Error: Transifex CLI (tx) is not installed or not in PATH"
+    echo "Please install it: https://developers.transifex.com/docs/cli"
+    exit 1
+fi
+
+# Run tx pull and check for errors
+set +e  # Temporarily disable exit on error to check tx pull status
 tx pull -a
+TX_EXIT_CODE=$?
+set -e  # Re-enable exit on error
+
+if [ "$TX_EXIT_CODE" -ne 0 ]; then
+    echo "Error: Transifex pull failed with exit code $TX_EXIT_CODE"
+    echo "Please check your Transifex configuration and authentication."
+    exit 1
+fi
 
 echo ""
 echo "Renaming and cleaning up directories..."
@@ -66,7 +138,7 @@ while IFS= read -r dir; do
             fi
             ;;
     esac
-done < <(find "$RES_DIR" -type d -name "values-*" | sort)
+done < <(find "$RES_DIR" -type d -name "values-*" 2>/dev/null | sort)
 
 echo "  Renamed $RENAMED_COUNT directories"
 echo "  Removed $REMOVED_COUNT directories"
@@ -77,7 +149,12 @@ echo "Normalizing XML formatting..."
 # Normalize XML
 NORMALIZED_COUNT=0
 while IFS= read -r file; do
-    awk '
+    # Validate XML before processing
+    if ! validate_xml "$file"; then
+        continue
+    fi
+
+    if awk '
         {
             gsub(/[[:space:]]+$/, "")
             if ($0 ~ /^[[:space:]]*<\/resources>[[:space:]]*$/) {
@@ -89,7 +166,17 @@ while IFS= read -r file; do
             if (saw_resources && $0 != "") saw_resources = 0
             print
         }
-    ' "$file" > "$file.tmp" && mv "$file.tmp" "$file" 2>/dev/null && NORMALIZED_COUNT=$((NORMALIZED_COUNT + 1))
+    ' "$file" > "$file.tmp"; then
+        if mv "$file.tmp" "$file" 2>/dev/null; then
+            NORMALIZED_COUNT=$((NORMALIZED_COUNT + 1))
+        else
+            echo "  Warning: Failed to replace $file"
+            rm -f "$file.tmp"
+        fi
+    else
+        echo "  Warning: Failed to normalize $file"
+        rm -f "$file.tmp"
+    fi
 done < <(find "$RES_DIR" -type f -path "*/values-*/strings.xml" 2>/dev/null)
 
 echo "  Normalized $NORMALIZED_COUNT files"
@@ -102,6 +189,7 @@ DELETED_DIRS=0
 declare -a dirs_to_check
 
 # Delete empty files and collect their directories
+set +e  # Allow commands to fail for empty file detection
 while IFS= read -r file; do
     line_count=$(wc -l < "$file" 2>/dev/null | tr -d ' ' || echo "0")
     string_count=$(grep -c '<string name=' "$file" 2>/dev/null || echo "0")
@@ -112,15 +200,20 @@ while IFS= read -r file; do
         rm -f "$file"
         EMPTY_COUNT=$((EMPTY_COUNT + 1))
     fi
-done < <(find "$RES_DIR" -type f -path "*/values-*/strings.xml")
+done < <(find "$RES_DIR" -type f -path "*/values-*/strings.xml" 2>/dev/null)
+set -e
 
 # Remove empty directories
-for dir in $(printf '%s\n' "${dirs_to_check[@]}" | sort -u); do
+for dir in $(printf '%s\n' "${dirs_to_check[@]}" | sort -u | sort -r); do
     [ -d "$dir" ] || continue
+    set +e  # Allow find to fail if directory is already gone
     file_count=$(find "$dir" -type f ! -name '.gitkeep' ! -name '.DS_Store' 2>/dev/null | wc -l | tr -d ' ')
+    set -e
     if [ "$file_count" -eq 0 ]; then
         echo "  Deleting empty directory: $dir"
-        rmdir "$dir" 2>/dev/null && DELETED_DIRS=$((DELETED_DIRS + 1))
+        if rmdir "$dir" 2>/dev/null; then
+            DELETED_DIRS=$((DELETED_DIRS + 1))
+        fi
     fi
 done