Skip to content

Adjust hub packaging scripts in cases where no files are found during upgrade #1880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
craigcomstock merged 1 commit into from
Sep 4, 2025
Merged

Adjust hub packaging scripts in cases where no files are found during upgrade #1880

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packaging/common/cfengine-hub/preinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,13 +397,13 @@ if [ -d $PREFIX/httpd/htdocs ]; then
# Purge all files in httpd/htdocs with exceptions listed in preserve_during_upgrade.txt
cf_console echo "Keeping only what's listed in preserve_during_upgrade.txt file"
PRESERVE_FILTER="`generate_preserve_filter`"
find "$PREFIX/httpd/htdocs" $PRESERVE_FILTER -type f -print0 | xargs -0 rm
find "$PREFIX/httpd/htdocs" $PRESERVE_FILTER -type f -print0 | xargs --no-run-if-empty -0 rm
elif [ -d $PREFIX/share/GUI ]; then
# Remove only files copied from share/GUI to httpd/htdocs
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 -f )
find -type f -print0 | ( cd ../../httpd/htdocs/ && xargs --no-run-if-empty -0 rm -f )
)
else
# Purge all files in httpd/htdocs with hardcoded exceptions:
Expand All @@ -413,7 +413,7 @@ if [ -d $PREFIX/httpd/htdocs ]; then
find "$PREFIX/httpd/htdocs" -not \( -path "$PREFIX/httpd/htdocs/public/tmp" -prune \) \
-not \( -name "cf_robot.php" \) \
-not \( -name "settings.ldap.php" \) \
-type f -print0 | xargs -0 -r rm
-type f -print0 | xargs --no-run-if-empty -0 rm
fi
if [ -d $PREFIX/share/GUI -a "x${PKG_TYPE}" = "xrpm" ]; then
# Make sure old files are not copied over together with new files later
Expand Down
Loading