feat: new error handling
This commit is contained in:
		
							
								
								
									
										82
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										82
									
								
								Makefile
									
									
									
									
									
								
							@@ -18,8 +18,8 @@ help:
 | 
			
		||||
	@echo '	tests		run tests from $(TESTS_DIR)'
 | 
			
		||||
	@echo '	lint		run shellcheck'
 | 
			
		||||
	@echo '	manpages	build manual pages from $(DOCS_DIR)'
 | 
			
		||||
	@echo '	install		install boring-backup with prefix'
 | 
			
		||||
	@echo '	uninstall	uninstall boring-backup with prefix'
 | 
			
		||||
	@echo '	install		install boring_backup with prefix'
 | 
			
		||||
	@echo '	uninstall	uninstall boring_backup with prefix'
 | 
			
		||||
	@echo
 | 
			
		||||
	@echo 'prefix examples: $$HOME/.local, /usr/local, /usr/bin'
 | 
			
		||||
	@echo See README for more info.
 | 
			
		||||
@@ -31,7 +31,7 @@ tests:
 | 
			
		||||
	done
 | 
			
		||||
 | 
			
		||||
lint:
 | 
			
		||||
	shellcheck $(SRC_DIR)/boring-backup
 | 
			
		||||
	shellcheck $(SRC_DIR)/boring_backup
 | 
			
		||||
	shellcheck $(SRC_DIR)/lib/*.sh
 | 
			
		||||
	shellcheck $(SRC_DIR)/lib/handlers/sources/*.sh
 | 
			
		||||
	shellcheck $(SRC_DIR)/lib/handlers/targets/*.sh
 | 
			
		||||
@@ -40,59 +40,59 @@ manpages:
 | 
			
		||||
	mkdir -pv $(BUILD_DIR)/share/man/ru/man1
 | 
			
		||||
	# See rst2man(1)
 | 
			
		||||
	# https://docutils.sourceforge.io/docs/index.html
 | 
			
		||||
	rst2man -v $(DOCS_DIR)/manpages/boring-backup.ru.1.rst \
 | 
			
		||||
		> $(BUILD_DIR)/share/man/ru/man1/boring-backup.1
 | 
			
		||||
	rst2man -v $(DOCS_DIR)/manpages/boring_backup.ru.1.rst \
 | 
			
		||||
		> $(BUILD_DIR)/share/man/ru/man1/boring_backup.1
 | 
			
		||||
	sed -e 's/.SH NAME/.SH ИМЯ/' \
 | 
			
		||||
		-e 's/.SH AUTHOR/.SH АВТОРЫ/' \
 | 
			
		||||
		-e 's/.SH COPYRIGHT/.SH АВТОРСКИЕ ПРАВА/' \
 | 
			
		||||
		-i $(BUILD_DIR)/share/man/ru/man1/boring-backup.1
 | 
			
		||||
	gzip -vf9 $(BUILD_DIR)/share/man/ru/man1/boring-backup.1
 | 
			
		||||
		-i $(BUILD_DIR)/share/man/ru/man1/boring_backup.1
 | 
			
		||||
	gzip -vf9 $(BUILD_DIR)/share/man/ru/man1/boring_backup.1
 | 
			
		||||
 | 
			
		||||
html: manpages
 | 
			
		||||
	mkdir -p $(BUILD_DIR)/share/doc/boring-backup
 | 
			
		||||
	zcat $(BUILD_DIR)/share/man/ru/man1/boring-backup.1.gz | \
 | 
			
		||||
	mkdir -p $(BUILD_DIR)/share/doc/boring_backup
 | 
			
		||||
	zcat $(BUILD_DIR)/share/man/ru/man1/boring_backup.1.gz | \
 | 
			
		||||
		groff -man -Kutf8 -Thtml \
 | 
			
		||||
		> $(BUILD_DIR)/share/doc/boring-backup/boring-backup.1.html 2>/dev/null
 | 
			
		||||
		> $(BUILD_DIR)/share/doc/boring_backup/boring_backup.1.html 2>/dev/null
 | 
			
		||||
	rm -v grohtml-*.png
 | 
			
		||||
 | 
			
		||||
install: manpages
 | 
			
		||||
	@echo prefix: $$prefix
 | 
			
		||||
	install -Dm755 $(SRC_DIR)/boring-backup $$prefix/bin/boring-backup
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/lib.sh $$prefix/share/boring-backup/lib.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/backup.sh $$prefix/share/boring-backup/backup.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/common.sh $$prefix/share/boring-backup/common.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/source.sh $$prefix/share/boring-backup/source.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/uri.sh $$prefix/share/boring-backup/uri.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/handlers/sources/tar.sh $$prefix/share/boring-backup/handlers/sources/tar.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/handlers/sources/mysqldump.sh $$prefix/share/boring-backup/handlers/sources/mysqldump.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/handlers/sources/pg_dump.sh $$prefix/share/boring-backup/handlers/sources/pg_dump.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/handlers/targets/cp.sh $$prefix/share/boring-backup/handlers/targets/cp.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/handlers/targets/s3cmd.sh $$prefix/share/boring-backup/handlers/targets/s3cmd.sh
 | 
			
		||||
	sed -e "s%LIBRARY=\"\$${LIBRARY:-.\/lib}\"%LIBRARY=\"\$${LIBRARY:-$$prefix\/share\/boring-backup}\"%" \
 | 
			
		||||
		-i $$prefix/share/boring-backup/lib.sh \
 | 
			
		||||
		-i $$prefix/bin/boring-backup
 | 
			
		||||
	install -Dm664 $(BUILD_DIR)/share/man/ru/man1/boring-backup.1.gz $$prefix/share/man/ru/man1/boring-backup.1.gz
 | 
			
		||||
	install -Dm755 $(SRC_DIR)/boring_backup $$prefix/bin/boring_backup
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/lib.sh $$prefix/share/boring_backup/lib.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/backup.sh $$prefix/share/boring_backup/backup.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/common.sh $$prefix/share/boring_backup/common.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/source.sh $$prefix/share/boring_backup/source.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/uri.sh $$prefix/share/boring_backup/uri.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/handlers/sources/tar.sh $$prefix/share/boring_backup/handlers/sources/tar.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/handlers/sources/mysqldump.sh $$prefix/share/boring_backup/handlers/sources/mysqldump.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/handlers/sources/pg_dump.sh $$prefix/share/boring_backup/handlers/sources/pg_dump.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/handlers/targets/cp.sh $$prefix/share/boring_backup/handlers/targets/cp.sh
 | 
			
		||||
	install -Dm644 $(SRC_DIR)/lib/handlers/targets/s3cmd.sh $$prefix/share/boring_backup/handlers/targets/s3cmd.sh
 | 
			
		||||
	sed -e "s%LIBRARY=\"\$${LIBRARY:-.\/lib}\"%LIBRARY=\"\$${LIBRARY:-$$prefix\/share\/boring_backup}\"%" \
 | 
			
		||||
		-i $$prefix/share/boring_backup/lib.sh \
 | 
			
		||||
		-i $$prefix/bin/boring_backup
 | 
			
		||||
	install -Dm664 $(BUILD_DIR)/share/man/ru/man1/boring_backup.1.gz $$prefix/share/man/ru/man1/boring_backup.1.gz
 | 
			
		||||
 | 
			
		||||
uninstall:
 | 
			
		||||
	@echo prefix: $$prefix
 | 
			
		||||
	rm $$prefix/bin/boring-backup
 | 
			
		||||
	rm $$prefix/share/boring-backup/lib.sh
 | 
			
		||||
	rm $$prefix/share/boring-backup/backup.sh
 | 
			
		||||
	rm $$prefix/share/boring-backup/common.sh
 | 
			
		||||
	rm $$prefix/share/boring-backup/source.sh
 | 
			
		||||
	rm $$prefix/share/boring-backup/uri.sh
 | 
			
		||||
	rm $$prefix/share/boring-backup/handlers/sources/tar.sh
 | 
			
		||||
	rm $$prefix/share/boring-backup/handlers/sources/mysqldump.sh
 | 
			
		||||
	rm $$prefix/share/boring-backup/handlers/sources/pg_dump.sh
 | 
			
		||||
	rm $$prefix/share/boring-backup/handlers/targets/cp.sh
 | 
			
		||||
	rm $$prefix/share/boring-backup/handlers/targets/s3cmd.sh
 | 
			
		||||
	rm -rv $$prefix/share/boring-backup
 | 
			
		||||
	rm $$prefix/share/man/ru/man1/boring-backup.1.gz
 | 
			
		||||
	rm $$prefix/bin/boring_backup
 | 
			
		||||
	rm $$prefix/share/boring_backup/lib.sh
 | 
			
		||||
	rm $$prefix/share/boring_backup/backup.sh
 | 
			
		||||
	rm $$prefix/share/boring_backup/common.sh
 | 
			
		||||
	rm $$prefix/share/boring_backup/source.sh
 | 
			
		||||
	rm $$prefix/share/boring_backup/uri.sh
 | 
			
		||||
	rm $$prefix/share/boring_backup/handlers/sources/tar.sh
 | 
			
		||||
	rm $$prefix/share/boring_backup/handlers/sources/mysqldump.sh
 | 
			
		||||
	rm $$prefix/share/boring_backup/handlers/sources/pg_dump.sh
 | 
			
		||||
	rm $$prefix/share/boring_backup/handlers/targets/cp.sh
 | 
			
		||||
	rm $$prefix/share/boring_backup/handlers/targets/s3cmd.sh
 | 
			
		||||
	rm -rv $$prefix/share/boring_backup
 | 
			
		||||
	rm $$prefix/share/man/ru/man1/boring_backup.1.gz
 | 
			
		||||
 | 
			
		||||
fixpath:
 | 
			
		||||
	# Set boring-backup library path
 | 
			
		||||
	# Set boring_backup library path
 | 
			
		||||
	@echo prefix: $$prefix
 | 
			
		||||
	@echo path: $$path
 | 
			
		||||
	sed -e "s%LIBRARY=\"\$${LIBRARY:-.\/lib}\"%LIBRARY=\"\$${LIBRARY:-$$path}\"%" \
 | 
			
		||||
		-i $$prefix/share/boring-backup/lib.sh \
 | 
			
		||||
		-i $$prefix/bin/boring-backup
 | 
			
		||||
		-i $$prefix/share/boring_backup/lib.sh \
 | 
			
		||||
		-i $$prefix/bin/boring_backup
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user