Fix bug where dotfiles are found in package root #73

[JehhB]

#73

[hwittenborn]

Hey, thanks for the PR! I'm working on some other stuff at the moment, but I'll try to get this merged by tomorrow or Monday.

[hwittenborn]

Not sure what's up, but these changes seem to be causing the false positives, I've never personally encountered them before, and it looks like the CI hasn't either.

What environment are you using makedeb in?

[JehhB]

I'm using debian unstable

[knokelmaat]

I have the same issue, also on debian unstable. Anything we can do on our end to help you debug?

[knokelmaat]

I modified the original dotfiles.sh to print some directory info:

check_dotfiles() {
	local ret=0

	ls "$pkgdir" 			# Extra info
	echo "$pkgdir"/.* 		# Extra info

	for f in "${pkgdir}/.*"; do

    		echo $f 		# Extra info
		echo ${f##*/} 		# Extra info
		echo . 			# Extra info

		[[ ${f##*/} == . || ${f##*/} == .. ]] && continue
		error "$(gettext "Dotfile found in package root '%s'")" "$f"
		ret=1
	done
	return $ret
}

This gives the following output:

christophe@localhost:~/Downloads/una-bin$ makedeb -si
[#] Making package: una-bin 3.2.0-1 (Tue 06 Sep 2022 10:32:15 AM CEST)
[#] Checking for missing dependencies...
[#] Loading extensions...
[#] Retrieving sources...
  [->] Found una
  [->] Found una-completion
  [->] Found una-updater
  [->] Found una.8.adoc
[#] Validating source files with sha256sums...
    una ... Skipped
    una-completion ... Skipped
    una-updater ... Skipped
    una.8.adoc ... Skipped
[#] Extracting sources...
[#] Removing existing $pkgdir/ directory...
[#] Entering fakeroot environment...
[#] Starting package()...
[#] Checking for packaging issues...
usr
/home/christophe/Downloads/una-bin/pkg/una-bin/.*
/home/christophe/Downloads/una-bin/pkg/una-bin/.*
.*
.
[!] Dotfile found in package root '/home/christophe/Downloads/una-bin/pkg/una-bin/.*

[hwittenborn]

Sorry for the late reply @JehhB and @knokelmaat, I didn't get anything in my GitHub notifications or I just overlooked it or something :P.

I have the same issue, also on debian unstable. Anything we can do on our end to help you debug?

Not at the moment, I should be able to get a Debian unstable Docker container going shortly to get this all tested, I think a know a pretty good way to get this solved though.

[hwittenborn]

We should be able to just avoid ls completely by using something like this. It does add another variable into the function, but it stops all this globbing nonsense that's causing issues:

local dotfiles
mapfile -t dotfiles < <(find -mindepth 1 -maxdepth 1 | sed 's|^\./||' | grep '^\.')

[JehhB]

What if I replace line 32 with

for f in $(find "$pkgdir" -mindepth 1 -maxdepth 1 -name '.*'); do

It also eliminate the globing issue and also doesn't introduce any new variable. I think it also better to keep the same error message wherein the full path of the dotfile is displayed.

[hwittenborn]

If there's a dotfile named something like .one two, then that gets printed as two separate files with that approach. It's not the end of the world if that were to happen, but I'd prefer to stick with mapfile just so errors all line up properly.

[hwittenborn]

Hey I'm gonna go ahead and get this merged, all these MRs have been around for quite a bit and I'm just wanting them closed so they ain't lingering around forever