2d7a24a1cfff5abe1ad155b93b9e98f26f8bef2a galt Wed Aug 21 12:37:23 2019 -0700 adding --whole-file to rsync will make it so that the user owns the new file and therefore when it changes, it should get fresh more likely correct perms and time diff --git src/hg/htdocs/makefile src/hg/htdocs/makefile index 560ef22..e596318 100644 --- src/hg/htdocs/makefile +++ src/hg/htdocs/makefile @@ -1,52 +1,52 @@ kentSrc = ../.. include ../../inc/common.mk GIT = git GITUP = ${GIT} pull FIND=gitFiles # if you need to pick up files not checked-in yet for rsync, # you can run it like this: # # make FIND=find # # but be careful as it will rsync everything over including junk # REMEMBER: HTDOCSEXTRA # htdocsExtra is a repository that contains large files that we # do not wish to burden the main kent repo with. # You can check it out and make there too. # If you think there is a file missing, see if it is under the htdocsExtra repo. ifeq (${DOCUMENTROOT_USER},) DOCUMENTROOT_USER=${DOCUMENTROOT}-${USER} endif user: if test -d ${DOCUMENTROOT_USER}; then \ ${MAKE} doInstall destDir=${DOCUMENTROOT_USER} ; \ fi alpha: ${MAKE} doInstall destDir=${DOCUMENTROOT} beta: ${GITUP} ${MAKE} doInstall destDir=qateam@hgwbeta:${DOCUMENTROOT} ${MAKE} doInstall destDir=${DOCUMENTROOT}-beta # Run rsync. Care is taken to preserve times and modes on files. rsync is # smart about recreating files under the current users so that times and # permissions may be modified. However, problems happen when a directory # is not owned by the current users. These options attemp to work around it. # use care in changing -rsyncOpts = --times --recursive --omit-dir-times --relative --cvs-exclude --exclude='makefile' --exclude='cpAndLinkToResourceFiles.pl' --exclude='style/*' +rsyncOpts = --whole-file --times --recursive --omit-dir-times --relative --cvs-exclude --exclude='makefile' --exclude='cpAndLinkToResourceFiles.pl' --exclude='style/*' doInstall: umask 002; rsync ${rsyncOpts} ${excl} ${incl} `$(FIND)` ${destDir} # Other targets that may be invoked by ../makefile: compile: install: alpha clean: