From 18355038013aa941e556decd8b2d33fc8675757b Mon Sep 17 00:00:00 2001 From: mr-GreyWolf Date: Sat, 7 May 2016 11:13:45 +0400 Subject: [PATCH 01/11] Create ru.po Russian language file --- po/ru.po | 845 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 845 insertions(+) create mode 100644 po/ru.po diff --git a/po/ru.po b/po/ru.po new file mode 100644 index 0000000..c3cb1c9 --- /dev/null +++ b/po/ru.po @@ -0,0 +1,845 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Backup manager 0.7.10\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-12-03 10:13+0100\n" +"PO-Revision-Date: 2015-03-21 17:01+0300\n" +"Last-Translator: \n" +"Language-Team: RUSSIAN\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.6.10\n" + +#: ../lib/actions.sh:47 +msgid "No backup method used." +msgstr "Не указан метод резервного копирования." + +#: ../lib/actions.sh:50 +#, sh-format +msgid "No such backup method: $BM_ARCHIVE_METHOD" +msgstr "Нет такого метода резервного копирования: $BM_ARCHIVE_METHOD" + +#: ../lib/actions.sh:59 +#, sh-format +msgid "Unable to change the owner of \"$md5file\"." +msgstr "Невозможно изменить владельца \"$md5file\"." + +#: ../lib/actions.sh:61 +#, sh-format +msgid "Unable to change file permissions of \"$md5file\"." +msgstr "Невозможно изменить права доступа \"$md5file\"." + +#: ../lib/actions.sh:93 +msgid "No upload method used." +msgstr "Невозможно использовать метод загрузки." + +#: ../lib/actions.sh:96 +#, sh-format +msgid "The upload method \"$method\" is not supported; skipping." +msgstr "Метод загрузки \"$method\" не поддерживается; пропускаем." + +#: ../lib/actions.sh:108 +#, sh-format +msgid "Cleaning $BM_REPOSITORY_ROOT" +msgstr "Очистка $BM_REPOSITORY_ROOT" + +#: ../lib/actions.sh:121 +#, sh-format +msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND." +msgstr "Выполнение Pre-command: $BM_PRE_BACKUP_COMMAND." + +#: ../lib/actions.sh:125 +msgid "Pre-command failed. Stopping the process." +msgstr "Не удалось выполнить pre-command. Остановка процесса." + +#: ../lib/actions.sh:130 +#, sh-format +msgid "Pre-command returned: \"$RET\" (success)." +msgstr "Pre-command: \"$RET\" (действия успешно выполнены)." + +#: ../lib/actions.sh:142 +#, sh-format +msgid "Running post-command: $BM_POST_BACKUP_COMMAND" +msgstr "Выполнение post-command: $BM_POST_BACKUP_COMMAND" + +#: ../lib/actions.sh:146 +msgid "Post-command failed." +msgstr "Не удалось выполнить post-command." + +#: ../lib/actions.sh:151 +#, sh-format +msgid "Post-command returned: \"$RET\" (success)." +msgstr "Post-command: \"$RET\" (действия успешно выполнены)." + +#: ../lib/actions.sh:183 +msgid "The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed." +msgstr "Значение BM_TARBALL_FILETYPE равно \"zip\" но zip не установлен." + +#: ../lib/actions.sh:188 +msgid "The BM_TARBALL_FILETYPE conf key is set to \"tar.bz2\" but bzip2 is not installed." +msgstr "Значение BM_TARBALL_FILETYPE равно \"tar.bz2\" но bzip не установлен." + +#: ../lib/actions.sh:193 +msgid "The BM_TARBALL_FILETYPE conf key is set to \"tar.lz\" but lzma is not installed." +msgstr "Значение BM_TARBALL_FILETYPE равно \"tar.lz\" но lzma не установлен." + +#: ../lib/actions.sh:198 +msgid "The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed." +msgstr "Значение BM_TARBALL_FILETYPE равно \"dar\" но dar не установлен." + +#: ../lib/actions.sh:210 +#, sh-format +msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it." +msgstr "Хранилище $BM_REPOSITORY_ROOT не существует, создадим его." + +#: ../lib/backup-methods.sh:26 +#, sh-format +msgid "$file_to_create: ok (${size}M," +msgstr "$file_to_create: успешно (${size}M," + +#: ../lib/backup-methods.sh:54 +#, sh-format +msgid "Unable to purge duplicates of $file_to_create" +msgstr "Невозможно очистить дубликаты $file_to_create" + +#: ../lib/backup-methods.sh:65 +#, sh-format +msgid "Unable to change the owner of \"$file\"." +msgstr "Невозможно изменить владельца \"$file\"." + +#: ../lib/backup-methods.sh:67 +#, sh-format +msgid "Unable to change file permissions of \"$file\"." +msgstr "Невозможно изменить права доступа к \"$file\"." + +#: ../lib/backup-methods.sh:78 +msgid "Warning, process interrupted." +msgstr "Предупреждение: процесс прерван." + +#: ../lib/backup-methods.sh:82 +#, sh-format +msgid "Removing archive \"$bm_pending_archive\" (build interrupted)." +msgstr "Перемещение архива \"$bm_pending_archive\" (запись прервана)." + +#: ../lib/backup-methods.sh:88 +#, sh-format +msgid "Restoring incremental-building details list: \"$bm_pending_incremental_list\"." +msgstr "Восстановление списка incremental-building: \"$bm_pending_incremental_list\"." + +#: ../lib/backup-methods.sh:124 +#, sh-format +msgid "Unable to create \"$target\", check $logfile" +msgstr "Невозможно создать \"$target\", читай $logfile" + +#: ../lib/backup-methods.sh:141 +#, sh-format +msgid "File $file_to_create already exists, skipping." +msgstr "Файл $file_to_create уже существует, пропускаем." + +#: ../lib/backup-methods.sh:152 +msgid "gzip is not installed but gzip compression needed." +msgstr "gzip не установлен но gzip нужен для сжатия." + +#: ../lib/backup-methods.sh:160 +msgid "bzip2 is not installed but bzip2 compression needed." +msgstr "bzip2 не установлен но bzip2 нужен для сжатия." + +#: ../lib/backup-methods.sh:178 ../lib/backup-methods.sh:202 +#, sh-format +msgid "Unable to exec $command; check $logfile" +msgstr "Невозможно выполнить $command; читай $logfile" + +#: ../lib/backup-methods.sh:184 +#, sh-format +msgid "Compressor $compress is needed." +msgstr "Сжатие $compress необходимо." + +#: ../lib/backup-methods.sh:209 +#, sh-format +msgid "No such compressor supported: $compress." +msgstr "Нет программ, которые поддерживают: $compress." + +#: ../lib/backup-methods.sh:215 +#, sh-format +msgid "Unable to find $file_to_create" +msgstr "Невозможно найти $file_to_create" + +#: ../lib/backup-methods.sh:343 +msgid "No frequency given, set BM_TARBALLINC_MASTERDATETYPE." +msgstr "Частота не заданна, задайте BM_TARBALLINC_MASTERDATETYPE." + +#: ../lib/backup-methods.sh:354 +#, sh-format +msgid "Unknown frequency: $BM_TARBALLINC_MASTERDATETYPE" +msgstr "Неизвестная частота: $BM_TARBALLINC_MASTERDATETYPE" + +#: ../lib/backup-methods.sh:387 +#, sh-format +msgid "Building master backup for target: \"$dir_name\"." +msgstr "Создание полной резервной копии для: \"$dir_name\"." + +#: ../lib/backup-methods.sh:520 +msgid "Tar reported a file changed during archive creation." +msgstr "Tar сообщает что файл изменен во время создания архива." + +#: ../lib/backup-methods.sh:531 +msgid "Dar reported a file changed during archive creation." +msgstr "Dar сообщает что файл изменен во время создания архива." + +#: ../lib/backup-methods.sh:569 +#, sh-format +msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"." +msgstr "Для архива \"tar.bz2\" нужна программа \"$bzip\"." + +#: ../lib/backup-methods.sh:576 +#, sh-format +msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"." +msgstr "Для архива \"tar.lz\" нужна программа \"$lzma\"." + +#: ../lib/backup-methods.sh:583 +#, sh-format +msgid "The archive type \"zip\" depends on the tool \"$zip\"." +msgstr "Для архива \"zip\" нужна программа \"$zip\"." + +#: ../lib/backup-methods.sh:589 +#, sh-format +msgid "The archive type \"dar\" depends on the tool \"$dar\"." +msgstr "Для архива \"dar\" нужна программа \"$dar\"." + +#: ../lib/backup-methods.sh:595 ../lib/backup-methods.sh:669 +#: ../lib/backup-methods.sh:715 +#, sh-format +msgid "The archive type \"$BM_TARBALL_FILETYPE\" is not supported." +msgstr "Тип архива \"$BM_TARBALL_FILETYPE\" не поддерживается." + +#: ../lib/backup-methods.sh:643 +msgid "The configuration variable \"BM_ENCRYPTION_RECIPIENT\" must be defined." +msgstr "Переменная \"BM_ENCRYPTION_RECIPIENT\" должна быть определена." + +#: ../lib/backup-methods.sh:649 +#, sh-format +msgid "The encryption is not yet possible with \"$BM_TARBALL_FILETYPE\" archives." +msgstr "Шифрование невозможно для архивов \"$BM_TARBALL_FILETYPE\"." + +#: ../lib/backup-methods.sh:687 +#, sh-format +msgid "The program \"$gpg\" is needed." +msgstr "Нужно программа \"$gpg\"." + +#: ../lib/backup-methods.sh:696 ../lib/backup-methods.sh:729 +#, sh-format +msgid "File $file_to_check already exists, skipping." +msgstr "Файл $file_to_check уже существует, пропускаем." + +#: ../lib/backup-methods.sh:761 +#, sh-format +msgid "Target \"$t\" is found in blacklist, skipping." +msgstr "Цель \"$t\" найдена в черном списке, пропускаем." + +#: ../lib/backup-methods.sh:765 +#, sh-format +msgid "Target \"$t\" does not exist, skipping." +msgstr "Цель \"$t\" не существует, пропускаем." + +#: ../lib/backup-methods.sh:841 ../lib/backup-methods.sh:881 +#: ../lib/backup-methods.sh:934 ../lib/backup-methods.sh:984 +#: ../lib/backup-methods.sh:1008 +#: ../lib/backup-methods.sh:867 +#, sh-format +msgid "1 error occurred during the tarball generation." +msgstr "1 ошибка в процессе создания архива." + +#: ../lib/backup-methods.sh:869 +#, sh-format +msgid "$nb_err errors occurred during the tarball generation." +msgstr "$nb_err ошибок в процессе создания архива." + +#: ../lib/backup-methods.sh:883 +#, sh-format +msgid "The \"pgsql\" method is chosen, but $pgdump is not found." +msgstr "Выбран метод \"pgsql\", но $pgdump не найден." + +#: ../lib/backup-methods.sh:890 +#, sh-format +msgid "Found existing PgSQL client configuration file: $pgsql_conffile" +msgstr "Найден существующий файл настройки клиента PgSQL: $pgsql_conffile" + +#: ../lib/backup-methods.sh:891 +msgid "Looking for matching credentials in this file..." +msgstr "Ищем соответствующие полномочия в этом файле..." + +#: ../lib/backup-methods.sh:893 +msgid "No matching credentials: inserting our own." +msgstr "Полномочия не найдены: вставляем ваши собственные." + +#: ../lib/backup-methods.sh:899 +#, sh-format +msgid "Creating a default PgSQL client configuration file: $HOME/.pgpass" +msgstr "Создаем файл настройки по умолчанию для клиента PgSQL: $HOME/.pgpass" + +#: ../lib/backup-methods.sh:920 +msgid "restoring initial .pgpass file." +msgstr "восстанавливаем изначальный файл .pgpass" + +#: ../lib/backup-methods.sh:936 +#, sh-format +msgid "The \"mysql\" method is chosen, but $mysqldump is not found." +msgstr "Выбран метод \"mysql\", но $mysqldump не найден." + +#: ../lib/backup-methods.sh:946 +#, sh-format +msgid "Using existing MySQL client configuration file: $mysql_conffile" +msgstr "Используем существующий файл настройки клиента MySQL: $mysql_conffile" + +#: ../lib/backup-methods.sh:950 +#, sh-format +msgid "Creating a default MySQL client configuration file: $mysql_conffile" +msgstr "Создаем файл настройки по умолчанию для клиента MySQL: $mysql_conffile" + +#: ../lib/backup-methods.sh:974 +#, sh-format +msgid "Removing default MySQL client configuration file: $mysql_conffile" +msgstr "Удаляем файл настройки по умолчанию для клиента MySQL: $mysql_conffile" + +#: ../lib/backup-methods.sh:986 +#, sh-format +msgid "The \"svn\" method is chosen, but $svnadmin is not found." +msgstr "Выбран метод \"svn\", но $svnadmin не найден." + +#: ../lib/backup-methods.sh:992 +#, sh-format +msgid "SVN repository \"$repository\" is not valid; skipping." +msgstr "SVN хранилище \"$repository\" недействительно; пропускаем." + +#: ../lib/backup-methods.sh:1017 +#, sh-format +msgid "Not enough args for this archive ($archive), skipping." +msgstr "Недостаточно аргументов для этого архива ($archive), пропускаем." + +#: ../lib/backup-methods.sh:1024 +msgid "Cannot create archive." +msgstr "Невозможно создать архив." + +#: ../lib/burning-methods.sh:37 +#, sh-format +msgid "Device \"/dev/$device\" is mounted on \"$m\", unmounting it." +msgstr "Устройство \"/dev/$device\" смонтировано в \"$m\", размонтируем его." + +#: ../lib/burning-methods.sh:53 +#, sh-format +msgid "MD5 checkup is only performed on disks. Please set the BM_BURNING_DEVICE in $conffile" +msgstr "Проверка MD5 возможна только для дисков. Пожалуйста задайте значение BM_BURNING_DEVICE в $conffile" + +#: ../lib/burning-methods.sh:59 +#, sh-format +msgid "The mount point $mount_point is not there." +msgstr "Точки монтирования $mount_point не существует." + +#: ../lib/burning-methods.sh:66 +#, sh-format +msgid "Mounting $BM_BURNING_DEVICE on $mount_point." +msgstr "Монтируем $BM_BURNING_DEVICE в $mount_point" + +#: ../lib/burning-methods.sh:90 +#, sh-format +msgid "Checking MD5 sum for $base_file:" +msgstr "Проверка контрольной суммы MD5 для $base_file:" + +#: ../lib/burning-methods.sh:109 +#, sh-format +msgid "$str ok." +msgstr "$str нормально." + +#: ../lib/burning-methods.sh:112 +#, sh-format +msgid "$str failed (read error)." +msgstr "$str не удалась (ошибка чтения)." + +#: ../lib/burning-methods.sh:116 +#, sh-format +msgid "$str failed (MD5 hash mismatch)." +msgstr "$str не удалась (Хеши MD5 не совпадают)." + +#: ../lib/burning-methods.sh:123 +msgid "Errors encountered during MD5 checks." +msgstr "В ходе проверки MD5 возникли ошибки." + +#: ../lib/burning-methods.sh:127 +#, sh-format +msgid "Unable to unmount the mount point $mount_point" +msgstr "Невозможно размонтировать точку монтирования $mount_point" + +#: ../lib/burning-methods.sh:128 +#, sh-format +msgid "Unable to remove the mount point $mount_point" +msgstr "Невозможно удалить точку монтирования $mount_point" + +#: ../lib/burning-methods.sh:147 +msgid "No burning method used." +msgstr "Метод записи не используется." + +#: ../lib/burning-methods.sh:171 +#, sh-format +msgid "Number of files to burn: $nb_file." +msgstr "Число файлов для записи: $nb_file." + +#: ../lib/burning-methods.sh:173 +#, sh-format +msgid "Nothing to burn for the $BM__BURNING_DATE, try the '--burn ' switch." +msgstr "Нечего записывать от $BM__BURNING_DATE, попробуйте использовать параметр '--burn <дата>'." + +#: ../lib/burning-methods.sh:202 ../lib/burning-methods.sh:227 +#, sh-format +msgid "Burning archives of $BM__BURNING_DATE." +msgstr "Запись архивов от $BM__BURNING_DATE" + +#: ../lib/burning-methods.sh:207 +#, sh-format +msgid "Cannot burn archives of the $BM__BURNING_DATE, too big: ${size}M, must fit in $BM_BURNING_MAXSIZE" +msgstr "Нельзя записать архивы от $BM__BURNING_DATE, размер больше: ${size}M, увеличьте значение $BM_BURNING_MAXSIZE" + +#: ../lib/burning-methods.sh:231 +msgid "Burning the whole archives." +msgstr "Запись полных архивов." + +#: ../lib/burning-methods.sh:236 +#, sh-format +msgid "Trying to burn $BM_REPOSITORY_ROOT ($size MB) in interactive mode. You will be prompted to enter insert a disc when needed" +msgstr "Запись $BM_REPOSITORY_ROOT ($size MB) в интерактивном режиме.Вам будет предложено вставить диск, когда это будет необходимо" + +#: ../lib/burning-methods.sh:267 +#, sh-format +msgid "Redirecting burning logs into $logfile" +msgstr "Перенаправление протокола записи в $logfile" + +#: ../lib/burning-methods.sh:272 +#, sh-format +msgid "Forcing dev=${BM_BURNING_DEVFORCED} for cdrecord commands." +msgstr "Принудительно dev=${BM_BURNING_DEVFORCED} для команд cdrecord" + +#: ../lib/burning-methods.sh:280 +#, sh-format +msgid "DVD+R(W) burning requires $growisofs, aborting." +msgstr "Для записи $growisofs нужен DVD+R(W), отмена." + +#: ../lib/burning-methods.sh:283 +#, sh-format +msgid "Exporting archives to the DVD+R(W) disc in $BM_BURNING_DEVICE." +msgstr "Экспорт архивов на DVD+R(W) в $BM_BURNING_DEVICE" + +#: ../lib/burning-methods.sh:287 ../lib/burning-methods.sh:307 +#: ../lib/burning-methods.sh:319 ../lib/burning-methods.sh:325 +#: ../lib/burning-methods.sh:338 +#, sh-format +msgid "failed, check $logfile" +msgstr "Не удалось, читай $logfile" + +#: ../lib/burning-methods.sh:292 +#, sh-format +msgid "DVD-R(W) burning requires $growisofs, aborting." +msgstr "Для записи DVD-R(W) требуется $growisofs, отмена." + +#: ../lib/burning-methods.sh:295 +#, sh-format +msgid "DVD-R(W) burning requires $dvdrwformat, aborting." +msgstr "Для записи DVD-R(W) требуется $dvdrwformat, отмена." + +#: ../lib/burning-methods.sh:298 +#, sh-format +msgid "Blanking the DVD-R(W) disc in $BM_BURNING_DEVICE" +msgstr "Чистый DVD-R(W) в $BM_BURNING_DEVICE" + +#: ../lib/burning-methods.sh:302 +#, sh-format +msgid "Unable to blank the DVD-R(W) disc (check $logfile)." +msgstr "Отсутствует чистый DVD-R(W) (читай $logfile)." + +#: ../lib/burning-methods.sh:304 +#, sh-format +msgid "Exporting archives to the DVD-R(W) disc in $BM_BURNING_DEVICE." +msgstr "Экспорт архивов на DVD-R(W) в $BM_BURNING_DEVICE." + +#: ../lib/burning-methods.sh:312 ../lib/burning-methods.sh:330 +#, sh-format +msgid "CD-R(W) burning requires $cdrecord, aborting." +msgstr "Для записи CD-R(W) требуется $cdrecord, отмена." + +#: ../lib/burning-methods.sh:315 +#, sh-format +msgid "Blanking the CDRW in $BM_BURNING_DEVICE." +msgstr "Чистый CDRW в $BM_BURNING_DEVICE." + +#: ../lib/burning-methods.sh:321 ../lib/burning-methods.sh:333 +#, sh-format +msgid "Burning data to $BM_BURNING_DEVICE." +msgstr "Запись на $BM_BURNING_DEVICE." + +#: ../lib/burning-methods.sh:342 +msgid "Nothing to burn." +msgstr "Нет данных для запись." + +#: ../lib/burning-methods.sh:346 +#, sh-format +msgid "The requested burning method is not supported, check BM_BURNING_METHOD in $conffile" +msgstr "Запрошенный метод записи не поддерживается, проверьте BM_BURNING_METHOD в $conffile" + +#: ../lib/burning-methods.sh:402 +#, sh-format +msgid "Not burning $file because it does not fit in the disk." +msgstr "Не записан $file потому что он не умещается на диск." + +#: ../lib/burning-methods.sh:443 +#, sh-format +msgid "No such index file: \"$index_file\"." +msgstr "Нет такого индексного файла: \"$index_file\"." + +#: ../lib/burning-methods.sh:485 +msgid "The burning process will need one disk." +msgstr "Для записи понадобится один диск." + +#: ../lib/burning-methods.sh:487 +#, sh-format +msgid "The burning process will need $number_of_indexes disks." +msgstr "Число дисков для записи: $number_of_indexes." + +#: ../lib/burning-methods.sh:499 +#, sh-format +msgid "Burning content of $index" +msgstr "Запись содержимого $index" + +#: ../lib/dialog.sh:27 +msgid "Output:" +msgstr "Вывод:" + +#: ../lib/dialog.sh:28 +msgid "Print this short help message." +msgstr "Вывести эту справочную информацию." + +#: ../lib/dialog.sh:29 +msgid "Print version number." +msgstr "Вывести номер версии." + +#: ../lib/dialog.sh:30 +msgid "Print what happens on STDOUT." +msgstr "Вывести информацию о ходе работы на STDOUT" + +#: ../lib/dialog.sh:31 +msgid "Print debug messages on STDOUT." +msgstr "Вывести отладочную информацию на STDOUT." + +#: ../lib/dialog.sh:32 +msgid "Disable warnings." +msgstr "Отключить предупреждения." + +#: ../lib/dialog.sh:35 +msgid "Single actions:" +msgstr "Одиночные действия:" + +#: ../lib/dialog.sh:36 +msgid "Just upload the files of the day." +msgstr "Загрузите файлы дня." + +#: ../lib/dialog.sh:37 +msgid "Just burn the files of the day." +msgstr "Записать файлы дня." + +#: ../lib/dialog.sh:38 +msgid "Just test the md5 sums." +msgstr "Проверить контрольные суммы (md5)." + +#: ../lib/dialog.sh:39 +msgid "Just purge old archives." +msgstr "Очистить старые архивы." + +#: ../lib/dialog.sh:42 +msgid "Behaviour:" +msgstr "Поведение:" + +#: ../lib/dialog.sh:43 +msgid "Choose an alternate config file." +msgstr "Использовать другой файл с параметрами." + +#: ../lib/dialog.sh:44 +msgid "Force overwrite of existing archives." +msgstr "Перезаписать существующие архивы." + +#: ../lib/dialog.sh:47 +msgid "Unwanted actions:" +msgstr "Нежелательные действия:" + +#: ../lib/dialog.sh:48 +msgid "Disable the upload process." +msgstr "Отключить процесс загрузки." + +#: ../lib/dialog.sh:49 +msgid "Disable the burning process." +msgstr "Отключить процесс записи." + +#: ../lib/dialog.sh:50 +msgid "Disable the purge process." +msgstr "Отключить процесс очистки." + +#: ../lib/dialog.sh:64 ../lib/dialog.sh:83 +#, fuzzy +msgid "Not in interactive mode, cannot continue." +msgstr "Не в интерактивном режиме, невозможно продолжить." + +#: ../lib/files.sh:79 ../lib/files.sh:94 +msgid "No path given." +msgstr "Путь не задан." + +#: ../lib/files.sh:169 +#, sh-format +msgid "Removing lock for old PID, $pid is not running." +msgstr "Удаление блокировки старого PID, $pid не запущен." + +#: ../lib/files.sh:179 +#, sh-format +msgid "A backup-manager process ($pid) is already running with the conffile $conffile" +msgstr "Backup-manager ($pid) уже запущен с конфигурационным файлом $conffile" + +#: ../lib/files.sh:183 ../lib/files.sh:189 +#, fuzzy, sh-format +msgid "Getting lock for backup-manager $pid with $conffile" +msgstr "Получение блокировки для backup-manager $pid с файлом $conffile" + +#: ../lib/files.sh:192 +msgid "failed (check the file permissions)." +msgstr "не удалось (проверьте права доступа к файлу)." + +#: ../lib/files.sh:280 +#, sh-format +msgid "$file is not a regular file." +msgstr "$file не является обычным файлом." + +#: ../lib/files.sh:305 +#, sh-format +msgid "Removing obsolete master backup: \"$file\"." +msgstr "Удаление устаревшего полной резервной копии: \"$file\"." + +#: ../lib/files.sh:313 +#, sh-format +msgid "Removing obsolete master backup (isolated): \"$file\"." +msgstr "Удаление устаревшего полной резервной копии (изолированной): \"$file\"." + +#: ../lib/files.sh:320 +#, sh-format +msgid "Removing archive \"$file\"." +msgstr "Удаление архива \"$file\"." + +#: ../lib/files.sh:342 +msgid "Directory given was not found." +msgstr "Данная папка не найдена." + +#: ../lib/files.sh:363 +#, sh-format +msgid "Removing archive \"$archive\"." +msgstr "Удаление архива \"$archive\"." + +#: ../lib/files.sh:387 +#, sh-format +msgid "The given file does not exist: $file_to_create" +msgstr "Данный файл не существует: $file_to_create" + +#: ../lib/files.sh:392 +#, fuzzy +msgid "No file given." +msgstr "Нет данных о файле." + +#: ../lib/files.sh:397 ../lib/files.sh:399 ../lib/files.sh:413 +msgid "Unable to get date from file." +msgstr "Не удалось получить данные из файла." + +#: ../lib/files.sh:403 +msgid "Unable to find the pattern of the file." +msgstr "Не удалось найти файл по шаблону." + +#: ../lib/files.sh:419 +#, sh-format +msgid "Unable to find the md5 hash of file \"$file\" in file \"$md5file\"." +msgstr "Не удалось найти хеш md5 для файла \"$file\" в файле \"$md5file\"." + +#: ../lib/files.sh:425 +#, sh-format +msgid "$file is a duplicate of $file_to_create (using symlink)." +msgstr "$file это дубликат $file_to_create (использована символическая ссылка)." + +#: ../lib/files.sh:436 +#, sh-format +msgid "File '$file' does not exist or is not readable." +msgstr "Файл '$file' не существует или не читается." + +#: ../lib/files.sh:444 +#, sh-format +msgid "File '$file' is not executable" +msgstr "Файл '$file' не является исполняемым" + +#: ../lib/logger.sh:159 ../backup-manager:257 +msgid "Unable to exec post-command." +msgstr "Не удалось выполнить post-command." + +#: ../lib/logger.sh:163 +msgid "Releasing lock" +msgstr "Освобождение блокировки" + +#: ../lib/logger.sh:169 +#, sh-format +msgid "Exit reason: $exit_reason" +msgstr "Причина выхода: $exit_reason" + +#: ../lib/md5sum.sh:30 +#, fuzzy +msgid "Internal error: bad usage of function get_md5sum_from_file()" +msgstr "Внутренняя ошибка: неправильное использование функции get_md5sum_from_file()" + +#: ../lib/md5sum.sh:34 +#, fuzzy, sh-format +msgid "No md5file found: $md5file" +msgstr "Файл с md5 не найден: $md5file" + +#: ../lib/md5sum.sh:82 +#, sh-format +msgid "Archive given does not exist in the repository: $archive" +msgstr "В хранилище нет данных архива: $archive" + +#: ../lib/sanitize.sh:32 +#, sh-format +msgid "The configuration key $key is not set, using \"$default\"." +msgstr "Конфигурационный ключ $key не задан, используется \"$default\"." + +#: ../lib/sanitize.sh:43 +#, sh-format +msgid "The configuration key \"$deprecated_key\" is deprecated, you should rename it \"$new_key\". Using \"$deprecated_value\"." +msgstr "Конфигурационный ключ \"$deprecated_key \" устарел, вы должны переименовать его в \"$new_key \". Используйте \"$deprecated_value \"." + +#: ../lib/sanitize.sh:84 +#, sh-format +msgid "The configuration key $key is not set but $keymandatory is enabled." +msgstr "Конфигурационный ключ $key не установлен, но $keymandatory включен." + +#: ../lib/sanitize.sh:102 +#, fuzzy, sh-format +msgid "Deprecated boolean, $key is set to \"yes\", setting \"true\" instead." +msgstr "Устаревшие логическое значение $key задано \"yes\", вместо этого нужно использовать \"true\"." + +#: ../lib/sanitize.sh:107 +#, sh-format +msgid "Deprecated boolean, $key is set to \"no\", setting \"false\" instead." +msgstr "Устаревшие логическое значение $key задано \"no\", вместо этого нужно использовать \"false\"." + +#: ../lib/sanitize.sh:131 +#, sh-format +msgid "Unable to create BM_TEMP_DIR: \"$BM_TEMP_DIR\"." +msgstr "Невозможно создать BM_TEMP_DIR: \"$BM_TEMP_DIR\"." + +#: ../lib/sanitize.sh:170 +#, fuzzy +msgid "BM_TARBALLINC_MASTERDATEVALUE should not be greater than 6, falling back to 0" +msgstr "BM_TARBALLINC_MASTERDATEVALUE не должно быть больше 6, уменьшите до 0" + +#: ../lib/sanitize.sh:175 +#, fuzzy +msgid "BM_TARBALLINC_MASTERDATEVALUE should not be greater than 31, falling back to 1" +msgstr "BM_TARBALLINC_MASTERDATEVALUE не должно быть больше 31, уменьшите на 1" + +#: ../lib/sanitize.sh:288 +#, sh-format +msgid "When validating the configuration file $conffile, $nb_warnings warnings were found." +msgstr "При проверке файла конфигурации $conffile, найдено $nb_warnings предупреждений." + +#: ../lib/upload-methods.sh:38 +msgid "Using the upload method \"ssh\"." +msgstr "Используется метод загрузки \"ssh\"." + +#: ../lib/upload-methods.sh:47 ../lib/upload-methods.sh:85 +msgid "No valid destination found, SSH upload not possible." +msgstr "Получатель недоступен, загрузка по SSH невозможна." + +#: ../lib/upload-methods.sh:68 +#, sh-format +msgid "Error reported by backup-manager-upload for method \"scp\", check \"$logfile\"." +msgstr "Получено сообщение об ошибке при метода загрузки \"scp\", читай \"$logfile\"." + +#: ../lib/upload-methods.sh:76 +msgid "Using the upload method \"ssh-gpg\"." +msgstr "Используется метод загрузки \"ssh-gpg\"." + +#: ../lib/upload-methods.sh:88 +msgid "No gpg recipient given. Argument is mandatory if upload method ssh-gpg is used." +msgstr "Не задан получатель gpg. Аргумент является обязательным, если используется метод загрузки ssh-gpg." + +#: ../lib/upload-methods.sh:105 +#, sh-format +msgid "Error reported by backup-manager-upload for method \"ssh-gpg\", check \"$logfile\"." +msgstr "Получено сообщение об ошибке при метода загрузки \"ssh-gpg\", читай \"$logfile\"." + +#: ../lib/upload-methods.sh:112 +msgid "Using the upload method \"ftp\"." +msgstr "Используется метод загрузки \"ftp\"." + +#: ../lib/upload-methods.sh:122 +msgid "No valid destination found, FTP upload not possible." +msgstr "Получатель недоступен, загрузка по FTP невозможна." + +#: ../lib/upload-methods.sh:146 +#, sh-format +msgid "Error reported by backup-manager-upload for method \"ftp\", check \"$logfile\"." +msgstr "Получено сообщение об ошибке при метода загрузки \"ftp\", читай \"$logfile\"." + +#: ../lib/upload-methods.sh:154 +msgid "Using the upload method \"S3\"." +msgstr "Используется метод загрузки \"S3\"." + +#: ../lib/upload-methods.sh:176 +#, sh-format +msgid "Error reported by backup-manager-upload for method \"s3\", check \"$logfile\"." +msgstr "Получено сообщение об ошибке при метода загрузки \"s3\", читай \"$logfile\"." + +#: ../lib/upload-methods.sh:182 +#, sh-format +msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}" +msgstr "Загрузка $directory на ${host}:${BM_UPLOAD_RSYNC_DESTINATION}" + +#: ../lib/upload-methods.sh:193 +msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)." +msgstr "Нужны настройки для использования rsync (задайте BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)." + +#: ../lib/upload-methods.sh:204 +#, sh-format +msgid "Upload of $directory with rsync failed; check $logfile." +msgstr "Загрузка $directory по rsync не удалась; читай $logfile." + +#: ../lib/upload-methods.sh:223 +msgid "No valid destination found, RSYNC upload not possible." +msgstr "Получатель недоступен, загрузка по RSYNC невозможна." + +#: ../lib/upload-methods.sh:242 +msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS." +msgstr "Не задан хост для метода загрузки rsync, задайте значение в BM_UPLOAD_RSYNC_HOSTS." + +#: ../lib/upload-methods.sh:249 +msgid "Using the upload method \"rsync\"." +msgstr "Используется метод загрузки \"rsync\"." + +#: ../lib/upload-methods.sh:256 +msgid "Using the upload method \"rsync-snapshots\"." +msgstr "Используется метод загрузки \"rsync-snapshots\"." + +#: ../backup-manager:127 +msgid "The -b option must be followed by a valid date (YYYYMMDD)." +msgstr "Для опции -b нужно задать правильную дату (ГГГГММДД)." + +#: ../backup-manager:162 +msgid "The -c option must be followed by an existing filename." +msgstr "Для опции -c нужно задать имя существующего файла." + +#: ../backup-manager:202 +msgid "Unable to exec the pre-command" +msgstr "Невозможно выполнить pre-command" From 0e641cbcff92bfd8d96c6cd9fd0edc4bad59797a Mon Sep 17 00:00:00 2001 From: Maximiliano Curia Date: Wed, 20 Jul 2016 09:56:22 +0200 Subject: [PATCH 02/11] Fix pattern generation If the file path includes the current date, the pattern replaces the date in the file path instead of the date of the backup date. This minor change uses the greediness of the .* pattern to match on the last occurrence of the date. Debian-Bug: https://bugs.debian.org/831759 Thanks: Chris Lamb for the report and the trace information. --- lib/files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/files.sh b/lib/files.sh index fdc3a5c..2fc77bd 100644 --- a/lib/files.sh +++ b/lib/files.sh @@ -412,7 +412,7 @@ function purge_duplicate_archives() error "Unable to get date from file." fi - file_pattern=$(echo $file_to_create | sed -e "s/$date_of_file/\*/") || + file_pattern=$(echo $file_to_create | sed -e "s/\\(.*\\)$date_of_file/\\1\*/") || error "Unable to find the pattern of the file." # loop on each archive occurences (eg: archivename-*-filetype) From 77854d1c2ba8fbd1609b368893c1a3912184bd11 Mon Sep 17 00:00:00 2001 From: Maximiliano Curia Date: Wed, 20 Jul 2016 16:16:31 +0200 Subject: [PATCH 03/11] Add a modified dupes test including a date This test checks if the pattern used to list the backups gets confused with date in the file path. --- t/t15.2-dupes-date.sh | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 t/t15.2-dupes-date.sh diff --git a/t/t15.2-dupes-date.sh b/t/t15.2-dupes-date.sh new file mode 100644 index 0000000..417a6be --- /dev/null +++ b/t/t15.2-dupes-date.sh @@ -0,0 +1,68 @@ +#!/bin/sh +# $Revision: $ +# $Date: $ + +set -e + +# Each test script should include testlib.sh +source testlib.sh +# When the test is ready, set this to false for nice outputs. +# if you want to see what happens, use those flags +# verbose="true" +# warnings="true" + +# The conffile part of the test, see confs/* for details. +source confs/base.conf +source confs/tarball.conf + +TODAY=$(date +%Y%m%d) +TESTDIR="testdir.$TODAY" + +export BM_ARCHIVE_ROOT="repository" +export BM_ARCHIVE_METHOD="tarball" +export BM_TARBALL_DIRECTORIES="$PWD/$TESTDIR" +export BM_TARBALLINC_MASTERDATETYPE="weekly" +export BM_TARBALL_FILETYPE="tar.gz" +export BM_ARCHIVE_PURGEDUPS="true" + +# This test is for incremental backups, we don't want master backups! +export BM_TARBALLINC_MASTERDATEVALUE="999" +source $locallib/sanitize.sh + +bm_init_env +bm_init_today +YESTERDAY=$(date +%Y%m%d --date '1 days ago') +TODAY=$YESTERDAY + +# The test actions +rm -rf $BM_REPOSITORY_ROOT +rm -rf $TESTDIR + +mkdir $TESTDIR +mkdir $TESTDIR/dir1 +cat /etc/passwd > $TESTDIR/dir1/file1 + +create_directories +make_archives + +name=$(get_dir_name "$PWD/$TESTDIR" long) +if [[ -e "$BM_ARCHIVE_ROOT/$BM_ARCHIVE_PREFIX$name.$YESTERDAY.master.tar.gz" ]]; then + bm_init_today + make_archives + + if [[ -L "$BM_ARCHIVE_ROOT/$BM_ARCHIVE_PREFIX$name.$YESTERDAY.master.tar.gz" ]]; then + info "Duplicate has been purged, succes." + rm -rf testdir + rm -rf $BM_ARCHIVE_ROOT + exit 0 + else + warning "Duplicate has not been purged, failure." + rm -rf testdir + rm -rf $BM_ARCHIVE_ROOT + exit 1 + fi +else + rm -rf testdir + rm -rf $BM_ARCHIVE_ROOT + exit 20 +fi From 1bbc3bcb2fb6cb81eed68af4c44a1fbdcf106744 Mon Sep 17 00:00:00 2001 From: Maximiliano Curia Date: Wed, 20 Jul 2016 15:45:21 +0200 Subject: [PATCH 04/11] Migrate from Net::Lite::FTP back to Net::FTP Net::Lite::FTP has been removed from Debian (back in 2010) and Net::FTP gained TLS and SSL support in the meantime. --- backup-manager-upload | 61 +++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 40 deletions(-) diff --git a/backup-manager-upload b/backup-manager-upload index 1cfa3ca..73e0570 100755 --- a/backup-manager-upload +++ b/backup-manager-upload @@ -667,50 +667,31 @@ sub send_files_with_ftp($$$$$) foreach my $host (@{$ra_hosts}) { my $ftp; - - # The FTP over TLS transfer mode - if ($BM_UPLOAD_FTP_SECURE) { - $ftp = ftptls_connect_to_host ($host); - unless (defined $ftp) { - print_error "Unable to connect to host: $host"; - return FALSE; - } - unless (ftptls_login($ftp, $user, $passwd)) { - print_error "Unable to login on ${host} in FTP TLS mode."; - return FALSE; - } - unless (ftptls_cwd($ftp, $repository)) { - print_info "The directory ${repository} does not exist, trying to create it."; - unless (ftptls_mkdir($ftp, $repository)) { - print_error "Unable to create directory ${repository} in FTP TLS mode: " . $ftp->message; - return FALSE; - } - } - print_info "Logged on $host, in $repository (FTP TLS mode)"; - } - - # The unencrypted FTP transfers - else { - $ftp = ftp_connect_to_host ($host); - unless (defined $ftp) { - print_error "Unable to connect to host: $host"; + $ftp = ftp_connect_to_host ($host); + unless (defined $ftp) { + print_error "Unable to connect to host: $host"; + return FALSE; + } + if ($BM_UPLOAD_FTP_SECURE) { + unless ($ftp->starttls()) { + print_error "Unable to start TLS connection on host: $host"; return FALSE; } + } - unless (ftp_login($ftp, $user, $passwd)) { - print_error "Unable to login on ${host} in FTP mode."; - return FALSE; - } - unless (ftp_cwd($ftp, $repository)) { - print_info "The directory ${repository} does not exist, trying to create it."; - unless (ftp_mkdir($ftp, $repository)) { - print_error "Unable to create directory ${repository} in FTP mode: " . $ftp->message; - return FALSE; - } - } - print_info "Logged on $host, in $repository (FTP binary mode)"; - } + unless (ftp_login($ftp, $user, $passwd)) { + print_error "Unable to login on ${host} in FTP mode."; + return FALSE; + } + unless (ftp_cwd($ftp, $repository)) { + print_info "The directory ${repository} does not exist, trying to create it."; + unless (ftp_mkdir($ftp, $repository)) { + print_error "Unable to create directory ${repository} in FTP mode: " . $ftp->message; + return FALSE; + } + } + print_info "Logged on $host, in $repository (FTP binary mode)"; # Now that we're connected and logged in, test an upload if needed if ($g_ftptest) { From 1d464f1c4fdcec2279855622655ec896017007a8 Mon Sep 17 00:00:00 2001 From: Philippe Villiers Date: Wed, 20 Jul 2016 21:56:54 +0200 Subject: [PATCH 05/11] Updated changelog and bumped version. --- ChangeLog | 9 +++++++++ VERSION | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bcc3a89..2439148 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Backup Manager 0.7.13 (not yet released) + [ Maximiliano Curia ] + * Fix for debian bts #831759 + Fix pattern generation + * Migrate from Net::Lite::FTP back to Net::FTP + + [ mr-GreyWolf ] + * Add Russian language file + Backup Manager 0.7.12 [ Philippe Villiers ] * Fix for issue #35 diff --git a/VERSION b/VERSION index 88a7b22..a48658c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.12 +0.7.13 From 30676f3fd728a2caa29583a66f3ccc2f3c8474b4 Mon Sep 17 00:00:00 2001 From: Maximiliano Curia Date: Tue, 23 Aug 2016 12:15:34 +0200 Subject: [PATCH 06/11] Force gzip to ignore the filename and timestamp By default gzip stores the filename and timestamp of the contained file, this prohibits any posibility of detecting dupes (when the files are not generated in the same second as done by the current dupes test). --- lib/backup-methods.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/backup-methods.sh b/lib/backup-methods.sh index 67d3929..c1e988f 100644 --- a/lib/backup-methods.sh +++ b/lib/backup-methods.sh @@ -854,9 +854,11 @@ function backup_method_tarball() debug "backup_method_tarball ($method)" info "Using method \"\$method\"." - + local oldgzip="$GZIP" + export GZIP="-n" + # build the command line - case $BM_TARBALL_FILETYPE in + case $BM_TARBALL_FILETYPE in tar|tar.bz2|tar.gz) dumpsymlinks="$(__get_flags_tar_dump_symlinks)" ;; @@ -874,9 +876,9 @@ function backup_method_tarball() else __make_remote_tarball_archives fi - + GZIP="$oldgzip" # Handle errors - # since version 0.8, BM's follows up its process even if errors were triggered + # since version 0.8, BM's follows up its process even if errors were triggered # during the archive generation. if [[ $nb_err -eq 1 ]]; then warning "1 error occurred during the tarball generation." From f74362e7321f59b1af0b9299053aec02a1d0b7a8 Mon Sep 17 00:00:00 2001 From: Maximiliano Curia Date: Thu, 20 Oct 2016 15:55:05 +0200 Subject: [PATCH 07/11] Drop extra continue --- lib/backup-methods.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/backup-methods.sh b/lib/backup-methods.sh index c1e988f..7f4b4ab 100644 --- a/lib/backup-methods.sh +++ b/lib/backup-methods.sh @@ -711,7 +711,6 @@ function __build_local_archive() warning "File \$file_to_check already exists, skipping." debug "rm -f ${bm_pending_incremental_list}.orig" rm -f "${bm_pending_incremental_list}.orig" - continue fi } From 6d7d8bdc5b623b79eabf3c6d06bbcf6251d384e6 Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Fri, 18 Nov 2016 12:31:28 -0500 Subject: [PATCH 08/11] Use .lzma extension for lzma-compressed files The .lz extension is normally used for lzip-compressed files, whereas .lzma should be used for lzma-compressed files. Fixes: #84 --- backup-manager.conf.tpl | 2 +- doc/user-guide.sgml | 8 ++++---- lib/actions.sh | 4 ++-- lib/backup-methods.sh | 10 +++++----- po/backup-manager.pot | 4 ++-- po/cs.po | 4 ++-- po/de.po | 4 ++-- po/es.po | 4 ++-- po/fr.po | 8 ++++---- po/it.po | 4 ++-- po/nl.po | 4 ++-- po/vi.po | 4 ++-- t/t17-tarball-lzma.sh | 4 ++-- 13 files changed, 32 insertions(+), 32 deletions(-) diff --git a/backup-manager.conf.tpl b/backup-manager.conf.tpl index b67c1da..cfea8ad 100644 --- a/backup-manager.conf.tpl +++ b/backup-manager.conf.tpl @@ -114,7 +114,7 @@ export BM_TARBALL_NAMEFORMAT="long" # Type of archives # Available types are: -# tar, tar.gz, tar.bz2, tar.lz, dar, zip. +# tar, tar.gz, tar.bz2, tar.lzma, dar, zip. # Make sure to satisfy the appropriate dependencies # (bzip2, dar, lzma, ...). export BM_TARBALL_FILETYPE="tar.gz" diff --git a/doc/user-guide.sgml b/doc/user-guide.sgml index 36de1e2..5b72d59 100644 --- a/doc/user-guide.sgml +++ b/doc/user-guide.sgml @@ -485,7 +485,7 @@ Suggested value: long. BM_TARBALL_FILETYPE

-Type: enum(tar, tar.gz, tar.bz2, tar.lz, zip, dar), default: tar.gz. +Type: enum(tar, tar.gz, tar.bz2, tar.lzma, zip, dar), default: tar.gz.

Basically, this configuration key defines the filetype of the resulting archive. @@ -496,20 +496,20 @@ Note that depending on the filetype you choose, you will have to make sure you have the corresponding compressor installed.

-For the best compression rate, choose tar.bz2 or tar.lz. +For the best compression rate, choose tar.bz2 or tar.lzma.

Since version 0.7.1, &bmngr; supports dar archives. This archiver provides some interesting features like the archive slicing.

-Since version 0.7.5, &bmngr; supports lzma archives. +Since version 0.7.5, &bmngr; supports lzma archives.

Make sure to statisfy dependencies according to the filetype you choose: tar.bz2 : needs "bzip2". - tar.lz : needs "lzma". + tar.lzma : needs "lzma". dar : needs "dar". zip : needs "zip". diff --git a/lib/actions.sh b/lib/actions.sh index e3b5e98..3a0444b 100644 --- a/lib/actions.sh +++ b/lib/actions.sh @@ -184,9 +184,9 @@ function check_filetypes() error "The BM_TARBALL_FILETYPE conf key is set to \"tar.bz2\" but bzip2 is not installed." fi ;; - "tar.lz" ) + "tar.lzma" ) if [[ ! -x "$lzma" ]]; then - error "The BM_TARBALL_FILETYPE conf key is set to \"tar.lz\" but lzma is not installed." + error "The BM_TARBALL_FILETYPE conf key is set to \"tar.lzma\" but lzma is not installed." fi ;; "dar" ) diff --git a/lib/backup-methods.sh b/lib/backup-methods.sh index 7f4b4ab..1d6b166 100644 --- a/lib/backup-methods.sh +++ b/lib/backup-methods.sh @@ -499,7 +499,7 @@ function __get_backup_tarball_remote_command() __get_flags_tar_blacklist "$target" command="$tar $blacklist $dumpsymlinks $BM_TARBALL_EXTRA_OPTIONS -p -c -j "$target"" ;; - tar.lz) + tar.lzma) __get_flags_tar_blacklist "$target" command="$tar $blacklist $dumpsymlinks $BM_TARBALL_EXTRA_OPTIONS -p -c --lzma "$target"" ;; @@ -586,9 +586,9 @@ function __get_backup_tarball_command() __get_flags_tar_blacklist "$target" command="$tar $incremental $blacklist $dumpsymlinks $BM_TARBALL_EXTRA_OPTIONS -p -c -j -f" ;; - tar.lz) + tar.lzma) if [[ ! -x $lzma ]]; then - error "The archive type \"tar.lz\" depends on the tool \"\$lzma\"." + error "The archive type \"tar.lzma\" depends on the tool \"\$lzma\"." fi __get_flags_tar_blacklist "$target" command="$tar $incremental $blacklist $dumpsymlinks $BM_TARBALL_EXTRA_OPTIONS -p -c --lzma -f" @@ -658,7 +658,7 @@ function build_encrypted_archive error "The configuration variable \"BM_ENCRYPTION_RECIPIENT\" must be defined." fi - if [[ "$BM_TARBALL_FILETYPE" = "tar.lz" ]] || + if [[ "$BM_TARBALL_FILETYPE" = "tar.lzma" ]] || [[ "$BM_TARBALL_FILETYPE" = "zip" ]] || [[ "$BM_TARBALL_FILETYPE" = "dar" ]]; then error "The encryption is not yet possible with \"\$BM_TARBALL_FILETYPE\" archives." @@ -796,7 +796,7 @@ function __make_local_tarball_token "dar") __get_flags_dar_incremental "$dir_name" ;; - "tar"|"tar.gz"|"tar.bz2"|"tar.lz") + "tar"|"tar.gz"|"tar.bz2"|"tar.lzma") __get_flags_tar_incremental "$dir_name" ;; esac diff --git a/po/backup-manager.pot b/po/backup-manager.pot index d49bcc8..ecc3cef 100644 --- a/po/backup-manager.pot +++ b/po/backup-manager.pot @@ -91,7 +91,7 @@ msgstr "" #: ../lib/actions.sh:193 msgid "" -"The BM_TARBALL_FILETYPE conf key is set to \"tar.lz\" but lzma is not " +"The BM_TARBALL_FILETYPE conf key is set to \"tar.lzma\" but lzma is not " "installed." msgstr "" @@ -208,7 +208,7 @@ msgstr "" #: ../lib/backup-methods.sh:576 #, sh-format -msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"." +msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." msgstr "" #: ../lib/backup-methods.sh:583 diff --git a/po/cs.po b/po/cs.po index bc6cc68..e2bc316 100644 --- a/po/cs.po +++ b/po/cs.po @@ -196,8 +196,8 @@ msgstr "Typ archivu \"tar.bz2\" závisí na nástroji \"$bzip\"." #: ../lib/backup-methods.sh:571 #, sh-format -msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"." -msgstr "Typ archivu \"tar.lz\" závisí na nástroji \"$lzma\"." +msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." +msgstr "Typ archivu \"tar.lzma\" závisí na nástroji \"$lzma\"." #: ../lib/backup-methods.sh:578 #, sh-format diff --git a/po/de.po b/po/de.po index cccb351..191dea9 100644 --- a/po/de.po +++ b/po/de.po @@ -214,8 +214,8 @@ msgstr "Der Archivtyp »tar.bz2« hängt vom Werkzeug »$bzip« ab." #: ../lib/backup-methods.sh:571 #, sh-format -msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"." -msgstr "Der Archivtyp »tar.lz« hängt vom Werkzeug »$lzma« ab." +msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." +msgstr "Der Archivtyp »tar.lzma« hängt vom Werkzeug »$lzma« ab." #: ../lib/backup-methods.sh:578 #, sh-format diff --git a/po/es.po b/po/es.po index 7744d2c..5fd8341 100644 --- a/po/es.po +++ b/po/es.po @@ -234,8 +234,8 @@ msgstr "El tipo de fichero \"tar.bz2\" depende de la herramienta \"$bzip\"." #: ../lib/backup-methods.sh:571 #, sh-format -msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"." -msgstr "El tipo de fichero \"tar.lz\" depende de la herramienta \"$lzma\"." +msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." +msgstr "El tipo de fichero \"tar.lzma\" depende de la herramienta \"$lzma\"." #: ../lib/backup-methods.sh:578 #, sh-format diff --git a/po/fr.po b/po/fr.po index 1354f0c..dde59cb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -83,8 +83,8 @@ msgid "The BM_TARBALL_FILETYPE conf key is set to \"tar.bz2\" but bzip2 is not i msgstr "La clef BM_TARBALL_FILETYPE vaut « tar.bz2 » mais bzip2 n'est pas installé." #: ../lib/actions.sh:193 -msgid "The BM_TARBALL_FILETYPE conf key is set to \"tar.lz\" but lzma is not installed." -msgstr "La clef BM_TARBALL_FILETYPE vaut « tar.lz » mais lzma n'est pas installé." +msgid "The BM_TARBALL_FILETYPE conf key is set to \"tar.lzma\" but lzma is not installed." +msgstr "La clef BM_TARBALL_FILETYPE vaut « tar.lzma » mais lzma n'est pas installé." #: ../lib/actions.sh:198 msgid "The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed." @@ -197,8 +197,8 @@ msgstr "Le type d'archive « tar.bz2 » dépend de l'outil « $bzip »." #: ../lib/backup-methods.sh:576 #, sh-format -msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"." -msgstr "Le type d'archive « tar.lz » dépend de l'outil « $lzma »." +msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." +msgstr "Le type d'archive « tar.lzma » dépend de l'outil « $lzma »." #: ../lib/backup-methods.sh:583 #, sh-format diff --git a/po/it.po b/po/it.po index 264b049..7e045ac 100644 --- a/po/it.po +++ b/po/it.po @@ -198,8 +198,8 @@ msgstr "Il tipo di archivio \"tar.bz2\" dipende dal tool \"$bzip\"." #: ../lib/backup-methods.sh:571 #, sh-format -msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"." -msgstr "Il tipo di archivio \"tar.lz\" dipende dal tool \"$lzma\"." +msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." +msgstr "Il tipo di archivio \"tar.lzma\" dipende dal tool \"$lzma\"." #: ../lib/backup-methods.sh:578 #, sh-format diff --git a/po/nl.po b/po/nl.po index 18ed7bb..04e216c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -196,8 +196,8 @@ msgstr "Het archieftype \"tar.bz2\" is afhankelijk van de tool \"$bzip\"." #: ../lib/backup-methods.sh:571 #, sh-format -msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"." -msgstr "Het archieftype \"tar.lz\" is afhankelijk van de tool \"$lzma\"." +msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." +msgstr "Het archieftype \"tar.lzma\" is afhankelijk van de tool \"$lzma\"." #: ../lib/backup-methods.sh:578 #, sh-format diff --git a/po/vi.po b/po/vi.po index fa8c5a3..f609c31 100644 --- a/po/vi.po +++ b/po/vi.po @@ -197,8 +197,8 @@ msgstr "Kiểu kho nén « tar.bz2 » phụ thuộc vào công cụ « $bzip ». #: ../lib/backup-methods.sh:571 #, sh-format -msgid "The archive type \"tar.lz\" depends on the tool \"$lzma\"." -msgstr "Kiểu kho nén « tar.lz » phụ thuộc vào công cụ « $lzma »." +msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." +msgstr "Kiểu kho nén « tar.lzma » phụ thuộc vào công cụ « $lzma »." #: ../lib/backup-methods.sh:578 #, sh-format diff --git a/t/t17-tarball-lzma.sh b/t/t17-tarball-lzma.sh index d597fb1..a9baecb 100644 --- a/t/t17-tarball-lzma.sh +++ b/t/t17-tarball-lzma.sh @@ -17,7 +17,7 @@ source confs/tarball.conf export BM_ARCHIVE_ROOT="repository" export BM_ARCHIVE_METHOD="tarball" export BM_TARBALL_DIRECTORIES="$PWD" -export BM_TARBALL_FILETYPE="tar.lz" +export BM_TARBALL_FILETYPE="tar.lzma" source $locallib/sanitize.sh # The test actions @@ -33,7 +33,7 @@ create_directories make_archives name=$(get_dir_name $PWD long) -if [[ -e "$BM_ARCHIVE_ROOT/$BM_ARCHIVE_PREFIX$name.$TODAY.master.tar.lz" ]]; then +if [[ -e "$BM_ARCHIVE_ROOT/$BM_ARCHIVE_PREFIX$name.$TODAY.master.tar.lzma" ]]; then rm -rf $BM_ARCHIVE_ROOT exit 0 else From 4eea33df9cf06947548aba9d260451ef5659d932 Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Fri, 18 Nov 2016 12:56:39 -0500 Subject: [PATCH 09/11] Add support for xz compression Fixes: #79 --- backup-manager.conf.tpl | 4 ++-- doc/user-guide.sgml | 5 +++-- lib/actions.sh | 5 +++++ lib/backup-methods.sh | 16 ++++++++++++++-- lib/externals.sh | 1 + po/backup-manager.pot | 11 +++++++++++ po/cs.po | 5 +++++ po/de.po | 5 +++++ po/es.po | 5 +++++ po/fr.po | 9 +++++++++ po/it.po | 5 +++++ po/nl.po | 5 +++++ po/vi.po | 5 +++++ t/t21-tarball-xz.sh | 41 +++++++++++++++++++++++++++++++++++++++++ t/testlib.sh | 1 + 15 files changed, 117 insertions(+), 6 deletions(-) create mode 100644 t/t21-tarball-xz.sh diff --git a/backup-manager.conf.tpl b/backup-manager.conf.tpl index cfea8ad..16ca081 100644 --- a/backup-manager.conf.tpl +++ b/backup-manager.conf.tpl @@ -114,9 +114,9 @@ export BM_TARBALL_NAMEFORMAT="long" # Type of archives # Available types are: -# tar, tar.gz, tar.bz2, tar.lzma, dar, zip. +# tar, tar.gz, tar.bz2, tar.xz, tar.lzma, dar, zip. # Make sure to satisfy the appropriate dependencies -# (bzip2, dar, lzma, ...). +# (bzip2, dar, xz, lzma, ...). export BM_TARBALL_FILETYPE="tar.gz" # You can choose to build archives remotely over SSH. diff --git a/doc/user-guide.sgml b/doc/user-guide.sgml index 5b72d59..baeae65 100644 --- a/doc/user-guide.sgml +++ b/doc/user-guide.sgml @@ -485,7 +485,7 @@ Suggested value: long. BM_TARBALL_FILETYPE

-Type: enum(tar, tar.gz, tar.bz2, tar.lzma, zip, dar), default: tar.gz. +Type: enum(tar, tar.gz, tar.bz2, tar.xz, tar.lzma, zip, dar), default: tar.gz.

Basically, this configuration key defines the filetype of the resulting archive. @@ -496,7 +496,7 @@ Note that depending on the filetype you choose, you will have to make sure you have the corresponding compressor installed.

-For the best compression rate, choose tar.bz2 or tar.lzma. +For the best compression rate, choose tar.bz2 or tar.xz.

Since version 0.7.1, &bmngr; supports dar archives. This archiver @@ -509,6 +509,7 @@ Make sure to statisfy dependencies according to the filetype you choose: tar.bz2 : needs "bzip2". + tar.xz : needs "xz". tar.lzma : needs "lzma". dar : needs "dar". zip : needs "zip". diff --git a/lib/actions.sh b/lib/actions.sh index 3a0444b..e94c95e 100644 --- a/lib/actions.sh +++ b/lib/actions.sh @@ -183,6 +183,11 @@ function check_filetypes() if [[ ! -x "$bzip" ]]; then error "The BM_TARBALL_FILETYPE conf key is set to \"tar.bz2\" but bzip2 is not installed." fi + ;; + "tar.xz" ) + if [[ ! -x "$xz" ]]; then + error "The BM_TARBALL_FILETYPE conf key is set to \"tar.xz\" but xz is not installed." + fi ;; "tar.lzma" ) if [[ ! -x "$lzma" ]]; then diff --git a/lib/backup-methods.sh b/lib/backup-methods.sh index 1d6b166..8aa9d4c 100644 --- a/lib/backup-methods.sh +++ b/lib/backup-methods.sh @@ -499,6 +499,10 @@ function __get_backup_tarball_remote_command() __get_flags_tar_blacklist "$target" command="$tar $blacklist $dumpsymlinks $BM_TARBALL_EXTRA_OPTIONS -p -c -j "$target"" ;; + tar.xz) + __get_flags_tar_blacklist "$target" + command="$tar $blacklist $dumpsymlinks $BM_TARBALL_EXTRA_OPTIONS -p -c --xz "$target"" + ;; tar.lzma) __get_flags_tar_blacklist "$target" command="$tar $blacklist $dumpsymlinks $BM_TARBALL_EXTRA_OPTIONS -p -c --lzma "$target"" @@ -586,6 +590,13 @@ function __get_backup_tarball_command() __get_flags_tar_blacklist "$target" command="$tar $incremental $blacklist $dumpsymlinks $BM_TARBALL_EXTRA_OPTIONS -p -c -j -f" ;; + tar.xz) + if [[ ! -x $xz ]]; then + error "The archive type \"tar.xz\" depends on the tool \"\$xz\"." + fi + __get_flags_tar_blacklist "$target" + command="$tar $incremental $blacklist $dumpsymlinks $BM_TARBALL_EXTRA_OPTIONS -p -c --xz -f" + ;; tar.lzma) if [[ ! -x $lzma ]]; then error "The archive type \"tar.lzma\" depends on the tool \"\$lzma\"." @@ -658,7 +669,8 @@ function build_encrypted_archive error "The configuration variable \"BM_ENCRYPTION_RECIPIENT\" must be defined." fi - if [[ "$BM_TARBALL_FILETYPE" = "tar.lzma" ]] || + if [[ "$BM_TARBALL_FILETYPE" = "tar.xz" ]] || + [[ "$BM_TARBALL_FILETYPE" = "tar.lzma" ]] || [[ "$BM_TARBALL_FILETYPE" = "zip" ]] || [[ "$BM_TARBALL_FILETYPE" = "dar" ]]; then error "The encryption is not yet possible with \"\$BM_TARBALL_FILETYPE\" archives." @@ -796,7 +808,7 @@ function __make_local_tarball_token "dar") __get_flags_dar_incremental "$dir_name" ;; - "tar"|"tar.gz"|"tar.bz2"|"tar.lzma") + "tar"|"tar.gz"|"tar.bz2"|"tar.xz"|"tar.lzma") __get_flags_tar_incremental "$dir_name" ;; esac diff --git a/lib/externals.sh b/lib/externals.sh index af21caf..1a23aa0 100644 --- a/lib/externals.sh +++ b/lib/externals.sh @@ -3,6 +3,7 @@ zip=$(which zip 2> /dev/null) || true bzip=$(which bzip2 2> /dev/null) || true gzip=$(which gzip 2> /dev/null) || true gpg=$(which gpg 2> /dev/null) || true +xz=$(which xz 2> /dev/null) || true lzma=$(which lzma 2> /dev/null) || true dar=$(which dar 2> /dev/null) || true tar=$(which tar 2> /dev/null) || true diff --git a/po/backup-manager.pot b/po/backup-manager.pot index ecc3cef..5dc408a 100644 --- a/po/backup-manager.pot +++ b/po/backup-manager.pot @@ -89,6 +89,12 @@ msgid "" "installed." msgstr "" +#: ../lib/actions.sh:193 +msgid "" +"The BM_TARBALL_FILETYPE conf key is set to \"tar.xz\" but xz is not " +"installed." +msgstr "" + #: ../lib/actions.sh:193 msgid "" "The BM_TARBALL_FILETYPE conf key is set to \"tar.lzma\" but lzma is not " @@ -206,6 +212,11 @@ msgstr "" msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"." msgstr "" +#: ../lib/backup-methods.sh:576 +#, sh-format +msgid "The archive type \"tar.xz\" depends on the tool \"$xz\"." +msgstr "" + #: ../lib/backup-methods.sh:576 #, sh-format msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." diff --git a/po/cs.po b/po/cs.po index e2bc316..853177e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -194,6 +194,11 @@ msgstr "" msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"." msgstr "Typ archivu \"tar.bz2\" závisí na nástroji \"$bzip\"." +#: ../lib/backup-methods.sh:571 +#, sh-format +msgid "The archive type \"tar.xz\" depends on the tool \"$xz\"." +msgstr "Typ archivu \"tar.xz\" závisí na nástroji \"$xz\"." + #: ../lib/backup-methods.sh:571 #, sh-format msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." diff --git a/po/de.po b/po/de.po index 191dea9..57c4a33 100644 --- a/po/de.po +++ b/po/de.po @@ -212,6 +212,11 @@ msgstr "Dar berichtete eine geänderte Datei beim Erstellen des Archivs." msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"." msgstr "Der Archivtyp »tar.bz2« hängt vom Werkzeug »$bzip« ab." +#: ../lib/backup-methods.sh:571 +#, sh-format +msgid "The archive type \"tar.xz\" depends on the tool \"$xz\"." +msgstr "Der Archivtyp »tar.xz« hängt vom Werkzeug »$xz« ab." + #: ../lib/backup-methods.sh:571 #, sh-format msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." diff --git a/po/es.po b/po/es.po index 5fd8341..685fc48 100644 --- a/po/es.po +++ b/po/es.po @@ -232,6 +232,11 @@ msgstr "" msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"." msgstr "El tipo de fichero \"tar.bz2\" depende de la herramienta \"$bzip\"." +#: ../lib/backup-methods.sh:571 +#, sh-format +msgid "The archive type \"tar.xz\" depends on the tool \"$xz\"." +msgstr "El tipo de fichero \"tar.xz\" depende de la herramienta \"$xz\"." + #: ../lib/backup-methods.sh:571 #, sh-format msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." diff --git a/po/fr.po b/po/fr.po index dde59cb..483cca9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -82,6 +82,10 @@ msgstr "La clef BM_TARBALL_FILETYPE vaut « zip » mais zip n'est pas install msgid "The BM_TARBALL_FILETYPE conf key is set to \"tar.bz2\" but bzip2 is not installed." msgstr "La clef BM_TARBALL_FILETYPE vaut « tar.bz2 » mais bzip2 n'est pas installé." +#: ../lib/actions.sh:193 +msgid "The BM_TARBALL_FILETYPE conf key is set to \"tar.xz\" but xz is not installed." +msgstr "La clef BM_TARBALL_FILETYPE vaut « tar.xz » mais xz n'est pas installé." + #: ../lib/actions.sh:193 msgid "The BM_TARBALL_FILETYPE conf key is set to \"tar.lzma\" but lzma is not installed." msgstr "La clef BM_TARBALL_FILETYPE vaut « tar.lzma » mais lzma n'est pas installé." @@ -195,6 +199,11 @@ msgstr "Dar a renvoyé qu'un fichier a changé pendant la création de l'archive msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"." msgstr "Le type d'archive « tar.bz2 » dépend de l'outil « $bzip »." +#: ../lib/backup-methods.sh:576 +#, sh-format +msgid "The archive type \"tar.xz\" depends on the tool \"$xz\"." +msgstr "Le type d'archive « tar.xz » dépend de l'outil « $xz »." + #: ../lib/backup-methods.sh:576 #, sh-format msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." diff --git a/po/it.po b/po/it.po index 7e045ac..1abc76d 100644 --- a/po/it.po +++ b/po/it.po @@ -196,6 +196,11 @@ msgstr "" msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"." msgstr "Il tipo di archivio \"tar.bz2\" dipende dal tool \"$bzip\"." +#: ../lib/backup-methods.sh:571 +#, sh-format +msgid "The archive type \"tar.xz\" depends on the tool \"$xz\"." +msgstr "Il tipo di archivio \"tar.xz\" dipende dal tool \"$xz\"." + #: ../lib/backup-methods.sh:571 #, sh-format msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." diff --git a/po/nl.po b/po/nl.po index 04e216c..ca161ac 100644 --- a/po/nl.po +++ b/po/nl.po @@ -194,6 +194,11 @@ msgstr "" msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"." msgstr "Het archieftype \"tar.bz2\" is afhankelijk van de tool \"$bzip\"." +#: ../lib/backup-methods.sh:571 +#, sh-format +msgid "The archive type \"tar.xz\" depends on the tool \"$xz\"." +msgstr "Het archieftype \"tar.xz\" is afhankelijk van de tool \"$xz\"." + #: ../lib/backup-methods.sh:571 #, sh-format msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." diff --git a/po/vi.po b/po/vi.po index f609c31..ce320bf 100644 --- a/po/vi.po +++ b/po/vi.po @@ -195,6 +195,11 @@ msgstr "" msgid "The archive type \"tar.bz2\" depends on the tool \"$bzip\"." msgstr "Kiểu kho nén « tar.bz2 » phụ thuộc vào công cụ « $bzip »." +#: ../lib/backup-methods.sh:571 +#, sh-format +msgid "The archive type \"tar.xz\" depends on the tool \"$xz\"." +msgstr "Kiểu kho nén « tar.xz » phụ thuộc vào công cụ « $xz »." + #: ../lib/backup-methods.sh:571 #, sh-format msgid "The archive type \"tar.lzma\" depends on the tool \"$lzma\"." diff --git a/t/t21-tarball-xz.sh b/t/t21-tarball-xz.sh new file mode 100644 index 0000000..880e7c0 --- /dev/null +++ b/t/t21-tarball-xz.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +set -e + +# Each test script should include testlib.sh +source testlib.sh +# When the test is ready, set this to false for nice outputs. +# if you want to see what happens, use those flags +#verbose="true" +#warnings="true" +#verbosedebug="true" + +# The conffile part of the test, see confs/* for details. +source confs/base.conf +source confs/tarball.conf + +export BM_ARCHIVE_ROOT="repository" +export BM_ARCHIVE_METHOD="tarball" +export BM_TARBALL_DIRECTORIES="$PWD" +export BM_TARBALL_FILETYPE="tar.xz" +source $locallib/sanitize.sh + +# The test actions + +if [[ -e $BM_ARCHIVE_ROOT ]]; then + rm -f $BM_ARCHIVE_ROOT/* +fi + +bm_init_env +bm_init_today + +create_directories +make_archives + +name=$(get_dir_name $PWD long) +if [[ -e "$BM_ARCHIVE_ROOT/$BM_ARCHIVE_PREFIX$name.$TODAY.master.tar.xz" ]]; then + rm -rf $BM_ARCHIVE_ROOT + exit 0 +else + exit 1 +fi diff --git a/t/testlib.sh b/t/testlib.sh index d980c01..f81d07b 100644 --- a/t/testlib.sh +++ b/t/testlib.sh @@ -21,6 +21,7 @@ zip=$(which zip) || true bzip=$(which bzip2) || true gzip=$(which gzip) || true gpg=$(which gpg) || true +xz=$(which xz) || true lzma=$(which lzma) || true dar=$(which dar) || true tar=$(which tar) || true From 4fff11919e68e6a1ad971ae92986a1bcd3cdb692 Mon Sep 17 00:00:00 2001 From: Philippe Villiers Date: Tue, 20 Dec 2016 21:36:17 +0100 Subject: [PATCH 10/11] Changelog update --- ChangeLog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2439148..527390b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,15 @@ -Backup Manager 0.7.13 (not yet released) +Backup Manager 0.7.13 + [ Matteo Cypriani ] + * Fix for issue #79 + Add support for xz compression + * Fix for issue #84 + Use .lzma extension for lzma-compressed files + [ Maximiliano Curia ] * Fix for debian bts #831759 Fix pattern generation * Migrate from Net::Lite::FTP back to Net::FTP + * Force gzip to ignore the filename and timestamp [ mr-GreyWolf ] * Add Russian language file From 733f6eefa77129047a709b68410db5fd2c0d4867 Mon Sep 17 00:00:00 2001 From: Philippe Villiers Date: Tue, 20 Dec 2016 21:42:46 +0100 Subject: [PATCH 11/11] Version bump --- INSTALL | 6 +++--- backup-manager | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALL b/INSTALL index 0e9fda5..c50aaa4 100644 --- a/INSTALL +++ b/INSTALL @@ -23,10 +23,10 @@ For Apple OSX with Fink: 2) Download Backup-Manager: - Olga:~ user$ curl -L https://github.com/sukria/Backup-Manager/zipball/v0.7.12 > ~/Desktop/Backup-manager-0.7.12.zip + Olga:~ user$ curl -L https://github.com/sukria/Backup-Manager/archive/0.7.13.zip > ~/Desktop/Backup-manager-0.7.13.zip Olga:~ user$ cd ~/Desktop - Olga:Desktop user$ unzip backup-manager-0.7.12.zip - Olga:Desktop user$ cd sukria-Backup-Manager-g3bfd294 + Olga:Desktop user$ unzip backup-manager-0.7.13.zip + Olga:Desktop user$ cd Backup-Manager-0.7.13 3) Then "make install", and install the needed packages asked by Fink, as all the needed packages are not installed with the basic Fink install. diff --git a/backup-manager b/backup-manager index 5439d89..18f3b66 100755 --- a/backup-manager +++ b/backup-manager @@ -26,7 +26,7 @@ set -e RELEASE="true" -VERSION="0.7.12" +VERSION="0.7.13" #Set prefix for paths BIN_PREFIX=/usr/bin