Shinonome/dots-hyprland
1
0
Fork 1
mirror of https://github.com/end-4/dots-hyprland.git synced 2026-06-05 14:59:27 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed the test and update script

Browse Source
This commit is contained in:
Bishoy Ehab
2025-10-19 00:40:00 +03:00
parent b23bdb0188
commit a48ebfc4c1
2 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdata/step/exp-update-tester.sh
+22 -16
View File
@@ -155,13 +155,14 @@ DRY_RUN=false
FORCE_CHECK=false
VERBOSE=false
NON_INTERACTIVE=true
SOURCE_ONLY=true
source "$ORIGINAL_DIR/sdata/step/exp-update.sh"
detected_dirs=$(detect_repo_structure)
if [[ -n "$detected_dirs" ]]; then
read -ra MONITOR_DIRS <<<"$detected_dirs"
detected_dirs=\$(detect_repo_structure)
if [[ -n "\$detected_dirs" ]]; then
read -ra MONITOR_DIRS <<<"\$detected_dirs"
fi
echo "Structure: ${MONITOR_DIRS[*]}"
echo "Structure: \${MONITOR_DIRS[*]}"
EOF
chmod +x test_detection.sh
@@ -214,13 +215,14 @@ DRY_RUN=false
FORCE_CHECK=false
VERBOSE=false
NON_INTERACTIVE=true
SOURCE_ONLY=true
source "$ORIGINAL_DIR/sdata/step/exp-update.sh"
detected_dirs=$(detect_repo_structure)
if [[ -n "$detected_dirs" ]]; then
read -ra MONITOR_DIRS <<<"$detected_dirs"
detected_dirs=\$(detect_repo_structure)
if [[ -n "\$detected_dirs" ]]; then
read -ra MONITOR_DIRS <<<"\$detected_dirs"
fi
echo "Structure: ${MONITOR_DIRS[*]}"
echo "Structure: \${MONITOR_DIRS[*]}"
EOF
chmod +x test_detection.sh
@@ -515,15 +517,17 @@ test_lock_file() {
echo "99999" > .update-lock
# Try to run update - should fail due to lock
if ./install.sh exp-update --skip-notice --non-interactive 2>&1 | grep -q "stale lock"; then
log_pass "Lock file mechanism works (detected stale lock)"
cd "$ORIGINAL_DIR"
return 0
else
log_fail "Lock file mechanism did not work as expected"
cd "$ORIGINAL_DIR"
return 1
if ./install.sh exp-update --skip-notice --non-interactive > lock_test_output.txt 2>&1; then
if grep -q "stale lock" lock_test_output.txt; then
log_pass "Lock file mechanism works (detected stale lock)"
cd "$ORIGINAL_DIR"
return 0
fi
fi
log_fail "Lock file mechanism did not work as expected"
cat lock_test_output.txt # Show output for debugging
cd "$ORIGINAL_DIR"
return 1
}
# Test 13: Test ** substring ignore patterns - FIXED
@@ -657,6 +661,7 @@ DRY_RUN=false
FORCE_CHECK=false
VERBOSE=false
NON_INTERACTIVE=true
SOURCE_ONLY=true
source "$ORIGINAL_DIR/sdata/step/exp-update.sh" 2>/dev/null
@@ -825,6 +830,7 @@ cleanup() {
cleanup_test_env
rm -f test_detection.sh test_ignore.sh test_safe_read.sh test_fresh_clone.sh test_substring_ignore.sh dry_run_output.txt 2>/dev/null || true
rm -f test_caching.sh test_dir_cache.sh 2>/dev/null || true
rm -f lock_test_output.txt 2>/dev/null || true
rm -rf "${HOME}/.config/test-app" 2>/dev/null || true
}
sdata/step/exp-update.sh
+13 -4
View File
@@ -160,10 +160,16 @@ load_ignore_patterns() {
[[ -z "$pattern" ]] && continue
# Separate substring patterns from regular patterns
if [[ "$pattern" == \*\** ]]; then
if [[ "${pattern:0:2}" == "**" ]]; then
local cleaned_pattern="${pattern#\*\*}"
cleaned_pattern="${cleaned_pattern%%*}"
IGNORE_SUBSTRING_PATTERNS+=("$cleaned_pattern")
# Strip trailing asterisks
while [[ "$cleaned_pattern" == *"*" ]] && [[ "${cleaned_pattern: -1}" == "*" ]]; do
cleaned_pattern="${cleaned_pattern%\*}"
done
# Ensure we have a non-empty pattern
if [[ -n "$cleaned_pattern" ]]; then
IGNORE_SUBSTRING_PATTERNS+=("$cleaned_pattern")
fi
else
IGNORE_PATTERNS+=("$pattern")
fi
@@ -716,12 +722,13 @@ cleanup_on_exit() {
}
# Set up signal handling and lock file
if [[ "${SOURCE_ONLY:-false}" != true ]]; then
trap cleanup_on_exit EXIT INT TERM
# Check for concurrent runs
if [[ -f "${REPO_ROOT}/.update-lock" ]]; then
# Check if the process is still running
if kill -0 $(cat "${REPO_ROOT}/.update-lock" 2>/dev/null) 2>/dev/null; then
if kill -0 "$(cat "${REPO_ROOT}/.update-lock" 2>/dev/null)" 2>/dev/null; then
log_die "Another update is already running (PID: $(cat "${REPO_ROOT}/.update-lock"))"
else
log_warning "Found stale lock file, removing..."
@@ -1138,4 +1145,6 @@ if [[ -d "${REPO_ROOT}/.update-backups" ]] && [[ "$DRY_RUN" != true ]]; then
log_info "Backups stored in: ${REPO_ROOT}/.update-backups/"
fi
fi
echo