diff --git a/meson.build b/meson.build index 3e6f611..2c824ab 100644 --- a/meson.build +++ b/meson.build @@ -2,10 +2,10 @@ project('zlevis', license: 'GPL3', version: '1') # Define bindir -bindir = join_paths(get_option('prefix'), get_option('bindir')) +bindir=join_paths(get_option('prefix'), get_option('bindir')) # Define bins list -bins = [] +bins=[] # Define subdir with bins subdir('src') diff --git a/src/meson.build b/src/meson.build index 509d9af..145e509 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,14 +1,4 @@ -# Find scripts -encrypt = find_program('zlevis-encrypt') -decrypt = find_program('zlevis-decrypt') -fetch = find_program('zlevis-fetch') - -# Test the scripts -test('zlevis-encrypt', encrypt, args: '--summary') -test('zlevis-decrypt', decrypt, args: '--summary') -test('zlevis-fetch', fetch, args: '--summary') - # Add paths of scripts to bins bins += join_paths(meson.current_source_dir(), 'zlevis-encrypt') bins += join_paths(meson.current_source_dir(), 'zlevis-decrypt') -bins += join_paths(meson.current_source_dir(), 'zlevis-fetch') \ No newline at end of file +bins += join_paths(meson.current_source_dir(), 'zlevis-fetch') diff --git a/src/zlevis-fetch b/src/zlevis-fetch index 39c8d0f..4faffb2 100755 --- a/src/zlevis-fetch +++ b/src/zlevis-fetch @@ -3,20 +3,8 @@ # Exit immediately if a command exits with a non-zero status set -e -# Summary of the script's functionality -summary="Decrypts a ZFS root pool with a TPM2.0 chip." - -# Display summary if requested -if [ "$1" = "--summary" ]; then - echo "$summary" - exit 0 -fi - # Check if zlevis-decrypt is present -if ! command -v zlevis-decrypt > /dev/null; then - echo "Script zlevis-decrypt is not present" - exit 1 -fi +command -v zlevis-decrypt > /dev/null || exit 1 # Read ZFS dataset information. zfs list -Ho name,encryption,keystatus,encryptionroot,tpm:jwe | while IFS=$'\t' read -r ds enc keystatus encroot jwe; do @@ -30,8 +18,8 @@ zfs list -Ho name,encryption,keystatus,encryptionroot,tpm:jwe | while IFS=$'\t' echo "Unlocked $ds" else echo "Failed to unlock $ds" >&2 - exit 1 + exit 1 fi fi fi -done +done \ No newline at end of file