meson.build

@@ -1,8 +1,14 @@
 # Project definition
-project('zlevis', license: 'GPL3', version: '2.3')
+project('zlevis', license: 'GPL3')
 
-# Define bin dir
+# Define bindir
-bin_dir = join_paths(get_option('prefix'), get_option('bindir'))
+bindir = join_paths(get_option('prefix'), get_option('bindir'))
+
+# Define bins list
+bins = []
 
 # Define subdir with bins
 subdir('src')
+
+# Install bins in bindir
+install_data(bins, install_dir: bindir)

src/meson.build

@@ -1,14 +1,14 @@
-# Find the scripts
+# Find scripts
-frontend = find_program('zlevis.in')
+main = find_program('zlevis')
-encrypt = find_program('zlevis-encrypt.in')
+encrypt = find_program('zlevis-encrypt')
-decrypt = find_program('zlevis-decrypt.in')
+decrypt = find_program('zlevis-decrypt')
 
 # Test the scripts
-test('zlevis', frontend, args: '--summary')
+test('zlevis', main, args: '--summary')
 test('zlevis-encrypt', encrypt, args: '--summary')
 test('zlevis-decrypt', decrypt, args: '--summary')
 
-# Configure the scripts
+# Add paths of scripts to bins
-configure_file(input: 'zlevis.in', output: 'zlevis', configuration: {'VERSION': meson.project_version()}, install: true, install_dir: bin_dir)
+bins += join_paths(meson.current_source_dir(), 'zlevis')
-configure_file(input: 'zlevis-encrypt.in', output: 'zlevis-encrypt', configuration: {'VERSION': meson.project_version()}, install: true, install_dir: bin_dir)
+bins += join_paths(meson.current_source_dir(), 'zlevis-encrypt')
-configure_file(input: 'zlevis-decrypt.in', output: 'zlevis-decrypt', configuration: {'VERSION': meson.project_version()}, install: true, install_dir: bin_dir)
+bins += join_paths(meson.current_source_dir(), 'zlevis-decrypt')

src/zlevis

@@ -3,24 +3,15 @@
 # Exit immediately if a command exits with a non-zero status
 set -e
 
-# Summary of the functionality of zlevis
+# Summary of the script's functionality
 summary="A tool that enables automatic decryption of ZFS rpools with TPM2"
 
-# Version of zlevis
-version="@VERSION@"
-
 # Display summary if requested
 if [ "$1" = "--summary" ]; then
     echo "$summary"
     exit 0
 fi
 
-# Display version if requested
-if [ "$1" = "--version" ]; then
-    echo "$version"
-    exit 0
-fi
-
 # Function to display usage information of zlevis
 info() {
     exec >&2
@@ -57,4 +48,4 @@ else
 fi
 
 # Exit with the status of the last command
-exit $?
+exit $?

src/zlevis-decrypt

@@ -3,13 +3,10 @@
 # Exit immediately if a command exits with a non-zero status
 set -e
 
-# Summary of the functionality of zlevis-decrypt
+# Summary of the script's functionality
 summary="Decrypts a JWE using a TPM2.0 chip"
 
-# Version of zlevis
+# TPM2.0 owner hierarchy to be used by the Operating System
-version="@VERSION@"
-
-# TPM2.0 owner hierarchy to be used by the operating system
 auth="o"
 
 # Display summary if requested
@@ -18,12 +15,6 @@ if [ "$1" = "--summary" ]; then
     exit 0
 fi
 
-# Display version if requested
-if [ "$1" = "--version" ]; then
-    echo "$version"
-    exit 0
-fi
-
 # Display usage information if input is from a terminal
 if [ -t 0 ]; then
     exec >&2

src/zlevis-encrypt

@@ -3,12 +3,9 @@
 # Exit immediately if a command exits with a non-zero status
 set -e
 
-# Summary of the functionality of zlevis-encrypt
+# Summary of the script's functionality
 summary="Encrypts using a TPM2.0 chip binding policy"
 
-# Version of zlevis
-version="@VERSION@"
-
 # TPM2.0 owner hierarchy to be used by the Operating System
 auth="o"
 
@@ -21,12 +18,6 @@ if [ "$1" = "--summary" ]; then
     exit 0
 fi
 
-# Display version if requested
-if [ "$1" = "--version" ]; then
-    echo "$version"
-    exit 0
-fi
-
 # Display usage information if input is from a terminal
 if [ -t 0 ]; then
     exec >&2