@@ -145,6 +145,32 @@ mountpoint -q /home/user/ || HOME_USER_MOUNTED=$?
145145STOW_COMPLETE=/home/user/.stow_completed
146146
147147if [ $HOME_USER_MOUNTED -eq 0 ] && [ ! -f $STOW_COMPLETE ]; then
148+ # There may be regular, non-symlink files in /home/user that match the
149+ # pathing of files in /home/tooling. Stow will error out when it tries to
150+ # stow on top of that. Instead, we can append to the current
151+ # /home/tooling/.stow-local-ignore file to ignore pre-existing,
152+ # non-symlinked files in /home/user that match those in /home/tooling before
153+ # we run stow.
154+ #
155+ # Create two text files containing a sorted path-based list of files in
156+ # /home/tooling and /home/user. Cut off "/home/user" and "/home/tooling" and
157+ # only get the sub-paths so we can do a proper comparison
158+ #
159+ # In the case of /home/user, we want regular file types and not symbolic
160+ # links.
161+ find /home/user -type f -xtype f -print | sort | sed ' s|/home/user||g' > /tmp/user.txt
162+ find /home/tooling -print | sort | sed ' s|/home/tooling||g' > /tmp/tooling.txt
163+ # We compare the two files, trying to find files that exist in /home/user
164+ # and /home/tooling. Being that the files that get flagged here are not
165+ # already synlinks, we will want to ignore them.
166+ IGNORE_FILES=" $( comm -12 /tmp/user.txt /tmp/tooling.txt) "
167+ # We no longer require the file lists, so remove them
168+ rm /tmp/user.txt /tmp/tooling.txt
169+ # For each file we need to ignore, append them to
170+ # /home/tooling/.stow-local-ignore.
171+ for f in $IGNORE_FILES ; do echo " ${f} " >> /home/tooling/.stow-local-ignore; done
172+ # We are now ready to run stow
173+ #
148174 # Create symbolic links from /home/tooling/ -> /home/user/
149175 stow . -t /home/user/ -d /home/tooling/ --no-folding -v 2 > /tmp/stow.log 2>&1
150176 # Vim does not permit .viminfo to be a symbolic link for security reasons, so manually copy it
0 commit comments