Ignore files from share/GUI missing in htdocs when removing

vpodzime · vpodzime · commit 3073718031b1 · 2019-02-10T18:54:29.000+01:00
Some of the files in /var/cfengine/share/GUI may be not exist in the /var/cfengine/httpd/htdocs directory because they may be removed by some processes and policies. Just ignore such files and move on. Ticket: ENT-3385 Changelog: None
diff --git a/packaging/common/cfengine-hub/preinstall.sh b/packaging/common/cfengine-hub/preinstall.sh
@@ -326,7 +326,7 @@ if [ -d $PREFIX/httpd/htdocs ]; then
     cf_console echo "Using share/GUI as template"
     ( cd $PREFIX/share/GUI
       # Make list of files in share/GUI and remove "them" from httpd/htdocs
-      find -type f -print0 | ( cd ../../httpd/htdocs/ && xargs -0 rm )
+      find -type f -print0 | ( cd ../../httpd/htdocs/ && xargs -0 rm -f )
     )
   else
     # Purge all files in httpd/htdocs with hardcoded exceptions:

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ if [ -d $PREFIX/httpd/htdocs ]; then`
`326`	`326`	`cf_console echo "Using share/GUI as template"`
`327`	`327`	`( cd $PREFIX/share/GUI`
`328`	`328`	`# Make list of files in share/GUI and remove "them" from httpd/htdocs`
`329`		`- find -type f -print0 \| ( cd ../../httpd/htdocs/ && xargs -0 rm )`
	`329`	`+ find -type f -print0 \| ( cd ../../httpd/htdocs/ && xargs -0 rm -f )`
`330`	`330`	`)`
`331`	`331`	`else`
`332`	`332`	`# Purge all files in httpd/htdocs with hardcoded exceptions:`