mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-04 06:30:27 +03:00 
			
		
		
		
	Fix detection of pyflakes3 found in Debian
This commit is contained in:
		
							parent
							
								
									d98b4d1b83
								
							
						
					
					
						commit
						84568c15a6
					
				
					 1 changed files with 14 additions and 15 deletions
				
			
		| 
						 | 
				
			
			@ -70,22 +70,21 @@ cmd_exists() {
 | 
			
		|||
	command -v $1 1>/dev/null
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
if cmd_exists pyflakes-python3; then
 | 
			
		||||
	PYFLAKES=pyflakes-python3
 | 
			
		||||
elif cmd_exists pyflakes; then
 | 
			
		||||
	PYFLAKES=pyflakes
 | 
			
		||||
else
 | 
			
		||||
	PYFLAKES=echo
 | 
			
		||||
	warn "pyflakes is not installed, using dummy placeholder!"
 | 
			
		||||
fi
 | 
			
		||||
find_command() {
 | 
			
		||||
	local name=$1
 | 
			
		||||
	for suff in "3" "-python3" ""; do
 | 
			
		||||
		cmd=${1}${suff}
 | 
			
		||||
		if cmd_exists $cmd; then
 | 
			
		||||
			echo -n $cmd
 | 
			
		||||
			return 0
 | 
			
		||||
		fi
 | 
			
		||||
	done
 | 
			
		||||
	warn "$1 is not installed, using dummy placeholder!"
 | 
			
		||||
	echo -n echo
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
if cmd_exists pep8-python3; then
 | 
			
		||||
	PEP8=pep8-python3
 | 
			
		||||
elif cmd_exists pep8; then
 | 
			
		||||
	PEP8=pep8
 | 
			
		||||
else
 | 
			
		||||
	err "pep8 is not installed!"
 | 
			
		||||
fi
 | 
			
		||||
PYFLAKES=$(find_command pyflakes)
 | 
			
		||||
PEP8=$(find_command pep8)
 | 
			
		||||
 | 
			
		||||
if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then
 | 
			
		||||
    if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue