rpmgs: preserve parent directory when KEEP_DIRS contains subdir paths

When KEEP_DIRS contains 'web/node_modules', the cleanup was deleting the 'web' parent directory because grep only matched '^web/node_modules$' not '^web$'. Now also add parent dir to grep pattern.

rpmgs: preserve parent directory when KEEP_DIRS contains subdir paths
3fb863d1 · Vitaly Lipatov · 2c31fc23 · 3fb863d1
Commit 3fb863d1 authored Apr 05, 2026 by Vitaly Lipatov
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

rpmgs bin/rpmgs +5 -1

No files found.
--- a/bin/rpmgs
+++ b/bin/rpmgs
@@ -860,7 +860,7 @@ update_predownloaded()

 		[ "$MODE" = "production" ] && PRODUCTION='--omit=dev'

-		info "Detected npm install hook in $npm_dir, running ..."
+		info "Detected npm install hook in $npm_dir (RGD=$RGD, CURNAME=$CURNAME), running ..."
 		pushd "$npm_dir" >/dev/null
 		docmd npm install $VERBOSE --omit=optional --ignore-scripts $PRODUCTION || fatal
 		popd >/dev/null
@@ -910,7 +910,11 @@ update_predownloaded()
 		info "Cleaning up, keeping:$KEEP_DIRS ..."
 		local grep_args=""
 		for i in $KEEP_DIRS ; do
+			# Match exact dir name; for subdir paths (web/node_modules) also keep parent dir
 			grep_args="$grep_args -e ^${i}$"
+			case "$i" in
+				*/*)  grep_args="$grep_args -e ^${i%%/*}$" ;;
+			esac
 		done
 		rm -rf $(ls -1 | grep -v $grep_args) .[a-zA-Z0-9]*
 	fi