diff --git a/.clang-tidy b/.clang-tidy index 1582d653..3c684d72 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -59,4 +59,3 @@ CheckOptions: - key: modernize-use-nullptr.NullMacros value: 'NULL' ... - diff --git a/.github/workflows/actions/run_tests/action.yaml b/.github/workflows/actions/run_tests/action.yaml index 0415269d..49909ac7 100644 --- a/.github/workflows/actions/run_tests/action.yaml +++ b/.github/workflows/actions/run_tests/action.yaml @@ -25,7 +25,7 @@ runs: ./test/blockstore/blockstore-test ${{inputs.gtest_args}} ./test/blobstore/blobstore-test ${{inputs.gtest_args}} ./test/cryfs/cryfs-test ${{inputs.gtest_args}} - + # TODO Also run on macOS once fixed if [[ "${{runner.os}}" == "macOS" ]]; then echo Skipping some tests because they are not fixed for macOS yet diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e1cf3c3c..50ceb329 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -403,7 +403,7 @@ jobs: with: gtest_args: ${{matrix.gtest_args}} extra_env_vars: ${{matrix.extra_env_vars_for_test}} - + windows: name: CI (Windows) strategy: diff --git a/LICENSE.txt b/LICENSE.txt index 65c5ca88..0a041280 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,7 +1,7 @@ GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/README.md b/README.md index f6217258..330cf44a 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ This only works for Ubuntu 17.04 and later, and Debian Stretch and later. You can also use CryFS on older versions of these distributions by following the **Building from source** instructions below. sudo apt install cryfs - + The following should work on Arch and Arch-based distros: - + sudo pacman -S cryfs Additionally, the following would work for any Linux distro with the Nix package manager: @@ -53,7 +53,7 @@ CryFS has experimental Windows support since the 0.10 release series. To install GUI === -Theres some GUI applications with CryFS support. You usually have to install the GUI **and** also CryFS itself for it to work. +There are some GUI applications with CryFS support. You usually have to install the GUI **and** also CryFS itself for it to work. - [SiriKali](https://mhogomchungu.github.io/sirikali/) - [Plasma Vault](https://www.kde.org/announcements/plasma-5.11.0.php) in KDE Plasma >= 5.11 diff --git a/archive.sh b/archive.sh index 1ea0a7a0..4a31c4d2 100755 --- a/archive.sh +++ b/archive.sh @@ -1,10 +1,10 @@ -#!/bin/bash +#!/usr/bin/env bash TAG=$1 GPGHOMEDIR=$2 -git archive --format=tgz "$1" > cryfs-$1.tar.gz -gpg --homedir "$GPGHOMEDIR" --armor --detach-sign cryfs-$1.tar.gz +git archive --format=tgz "$1" > "cryfs-$1.tar.gz" +gpg --homedir "$GPGHOMEDIR" --armor --detach-sign "cryfs-$1.tar.gz" -git archive --format=tar "$1" | xz -9 > cryfs-$1.tar.xz -gpg --homedir "$GPGHOMEDIR" --armor --detach-sign cryfs-$1.tar.xz +git archive --format=tar "$1" | xz -9 > "cryfs-$1.tar.xz" +gpg --homedir "$GPGHOMEDIR" --armor --detach-sign "cryfs-$1.tar.xz" diff --git a/doc/man/cryfs.1 b/doc/man/cryfs.1 index 4626c274..9611e229 100644 --- a/doc/man/cryfs.1 +++ b/doc/man/cryfs.1 @@ -219,7 +219,7 @@ Unmount automatically after \fIarg\fR minutes of inactivity. Pass through options to the FUSE filesystem driver. .TP -For example: +For example: .TP \fB\-o\fR \fIallow_other\fR This option overrides the security measure restricting file