Use consistent and less error-prone find rm's
This commit is contained in:
		
							
								
								
									
										6
									
								
								debian/pvc-client-cli.postinst
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								debian/pvc-client-cli.postinst
									
									
									
									
										vendored
									
									
								
							| @@ -2,10 +2,12 @@ | |||||||
|  |  | ||||||
| # Generate the bash completion configuration | # Generate the bash completion configuration | ||||||
| if [ -d /etc/bash_completion.d ]; then | if [ -d /etc/bash_completion.d ]; then | ||||||
|  |     echo "Installing BASH completion configuration" | ||||||
|     _PVC_COMPLETE=source_bash pvc > /etc/bash_completion.d/pvc |     _PVC_COMPLETE=source_bash pvc > /etc/bash_completion.d/pvc | ||||||
| fi | fi | ||||||
|  |  | ||||||
| # Remove pycaches | # Remove any cached CPython directories or files | ||||||
| find /usr/lib/python3/dist-packages/pvc -name "__pycache__" -exec rm -r {} \; | echo "Cleaning up CPython caches" | ||||||
|  | find /usr/lib/python3/dist-packages/pvc -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true | ||||||
|  |  | ||||||
| exit 0 | exit 0 | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								debian/pvc-daemon-api.preinst
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								debian/pvc-daemon-api.preinst
									
									
									
									
										vendored
									
									
								
							| @@ -1,5 +1,5 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
|  |  | ||||||
| # Remove any cached CPython directories or files | # Remove any cached CPython directories or files | ||||||
| echo "Cleaning up existing CPython files" | echo "Cleaning up CPython caches" | ||||||
| find /usr/share/pvc/pvcapid -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null || true | find /usr/share/pvc/pvcapid -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true | ||||||
|   | |||||||
							
								
								
									
										5
									
								
								debian/pvc-daemon-common.preinst
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								debian/pvc-daemon-common.preinst
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,5 @@ | |||||||
|  | #!/bin/sh | ||||||
|  |  | ||||||
|  | # Remove any cached CPython directories or files | ||||||
|  | echo "Cleaning up CPython caches" | ||||||
|  | find /usr/share/pvc/daemon_lib -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true | ||||||
							
								
								
									
										6
									
								
								debian/pvc-daemon-health.preinst
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								debian/pvc-daemon-health.preinst
									
									
									
									
										vendored
									
									
								
							| @@ -1,6 +1,6 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
|  |  | ||||||
| # Remove any cached CPython directories or files | # Remove any cached CPython directories or files | ||||||
| echo "Cleaning up existing CPython files" | echo "Cleaning up CPython caches" | ||||||
| find /usr/share/pvc/pvchealthd -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null || true | find /usr/share/pvc/pvchealthd -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true | ||||||
| find /usr/share/pvc/plugins -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null || true | find /usr/share/pvc/plugins -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								debian/pvc-daemon-node.preinst
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								debian/pvc-daemon-node.preinst
									
									
									
									
										vendored
									
									
								
							| @@ -1,5 +1,5 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
|  |  | ||||||
| # Remove any cached CPython directories or files | # Remove any cached CPython directories or files | ||||||
| echo "Cleaning up existing CPython files" | echo "Cleaning up CPython caches" | ||||||
| find /usr/share/pvc/pvcnoded -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null || true | find /usr/share/pvc/pvcnoded -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								debian/pvc-daemon-worker.preinst
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								debian/pvc-daemon-worker.preinst
									
									
									
									
										vendored
									
									
								
							| @@ -1,5 +1,5 @@ | |||||||
| #!/bin/sh | #!/bin/sh | ||||||
|  |  | ||||||
| # Remove any cached CPython directories or files | # Remove any cached CPython directories or files | ||||||
| echo "Cleaning up existing CPython files" | echo "Cleaning up CPython caches" | ||||||
| find /usr/share/pvc/pvcworkerd -type d -name "__pycache__" -exec rm -rf {} \; &>/dev/null || true | find /usr/share/pvc/pvcworkerd -type d -name "__pycache__" -exec rm -fr {} + &>/dev/null || true | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							| @@ -13,7 +13,7 @@ override_dh_python3: | |||||||
| 	rm -r $(CURDIR)/client-cli/.pybuild $(CURDIR)/client-cli/pvc.egg-info | 	rm -r $(CURDIR)/client-cli/.pybuild $(CURDIR)/client-cli/pvc.egg-info | ||||||
|  |  | ||||||
| override_dh_auto_clean: | override_dh_auto_clean: | ||||||
| 	find . -name "__pycache__" -o -name ".pybuild" -exec rm -r {} \; || true | 	find . -name "__pycache__" -o -name ".pybuild" -exec rm -fr {} + || true | ||||||
|  |  | ||||||
| # If you need to rebuild the Sphinx documentation | # If you need to rebuild the Sphinx documentation | ||||||
| # Add spinxdoc to the dh --with line | # Add spinxdoc to the dh --with line | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user