installation/:

- Move packages.sh to env.sh, modify the other files accordingly.
- Find git root in a simpler way.
- Add a shebang where appropriate.

dracut.module/configure

 #!/bin/bash
 
 # At the moment, this is not a standard configure script. It is only used to generate a makefile with the good package names.
-source ../installation/packages.sh
+source ../installation/env.sh
 
 FLB_PATH=/opt/${FLUENTBIT_NAME_AND_VERSION}
 MCA_PATH=/opt/${MCA_NAME_AND_VERSION}

installation/dependencies.sh

+#!/bin/bash
 
 set -e
 
 # get the root of the git repository (requires git to be installed)
-GIT_ROOT=`realpath -m ./$(git rev-parse --show-cdup)`
+GIT_ROOT=`git rev-parse --show-toplevel`
 cd $GIT_ROOT/installation/
 
-# initialize package name variables
-source packages.sh
+# define useful variables
+source env.sh
 
 # useful tools
 apt -y install ${APT_UTILITY_PACKAGES}

installation/packages.sh → installation/env.sh

 # This file is sourced by various other scripts used to install this project.
 
-ARCH=amd64
-PACKAGE_EXTENSION=.deb
-MCA_VERSION=1-1
-FLUENTBIT_VERSION=1-1
+# get the root of the git repository (requires git to be installed)
+GIT_ROOT=`git rev-parse --show-toplevel`
+PROJECT_DIR=$GIT_ROOT
+
+
+# TO BE MODIFIED BY USERS:
 MCA_PACKAGE_NAME=dep--mca-static
 FLUENTBIT_PACKAGE_NAME=fluent-bit
+MCA_VERSION=1-1
+FLUENTBIT_VERSION=1-1
+ARCH=amd64
+PACKAGE_EXTENSION=.deb
+
 
-# used in dracut.module/configure
+# used mainly in dracut.module/configure
 MCA_NAME_AND_VERSION=${MCA_PACKAGE_NAME}_${MCA_VERSION}
 FLUENTBIT_NAME_AND_VERSION=${FLUENTBIT_PACKAGE_NAME}_${FLUENTBIT_VERSION}
 
-# used in installation/dependencies.sh
+# used mainly in installation/dependencies.sh and installation/remove-dependencies.sh
 APT_UTILITY_PACKAGES="sudo wget tree"
 APT_SPECIFIC_PACKAGES="dracut-core dracut dracut-network"
 
@@ -21,6 +28,15 @@ URL_PATTERN="https://download.opensuse.org/repositories/home:/fg.nxd/Debian_11/"
 MCA_PACKAGE_URL=${URL_PATTERN}/${ARCH}/${MCA_PACKAGE_FILE}
 FLUENTBIT_PACKAGE_URL=${URL_PATTERN}/${ARCH}/${FLUENTBIT_PACKAGE_FILE}
 
-# DEBUG 100
-#echo MCA_PACKAGE_FILE = ${MCA_PACKAGE_FILE}
-#echo FLUENTBIT_PACKAGE_FILE = ${FLUENTBIT_PACKAGE_FILE}
+# used mainly in installation/install.sh and installation/uninstall.sh
+SOURCE_EFI_DIR=/boot/efi/EFI/
+TARGET_EFI_DIR=/EFI/
+SOURCE_EFI_DIR=`realpath -m $SOURCE_EFI_DIR`
+TARGET_EFI_DIR=`realpath -m $TARGET_EFI_DIR`
+SOURCE_IMAGE_DIR=$SOURCE_EFI_DIR/Linux/
+TARGET_IMAGE_DIR=$TARGET_EFI_DIR/Linux/
+dracut_output_file=dracut-output
+
+#TARGET_DISK=/dev/nvme1n1
+#TARGET_EFI_PARTITION=${TARGET_DISK}p1
+#TARGET_ROOT_PARTITION=${TARGET_DISK}p2

installation/install.sh

+#!/bin/bash
 
 set -e
 
 # get the root of the git repository (requires git to be installed)
-GIT_ROOT=`realpath -m $(git rev-parse --show-cdup)`
+GIT_ROOT=`git rev-parse --show-toplevel`
 cd $GIT_ROOT
 
-PROJECT_DIR=`pwd`
-SOURCE_EFI_DIR=/boot/efi/EFI/
-TARGET_EFI_DIR=/EFI/
-SOURCE_EFI_DIR=`realpath -m $SOURCE_EFI_DIR`
-TARGET_EFI_DIR=`realpath -m $TARGET_EFI_DIR`
-SOURCE_IMAGE_DIR=$SOURCE_EFI_DIR/Linux/
-TARGET_IMAGE_DIR=$TARGET_EFI_DIR/Linux/
-dracut_output_file=dracut-output
+# define useful variables
+source installation/env.sh
+
 
 # This script assumes to be run by the root user (with /sbin in the path).
 

installation/remove-dependencies.sh

+#!/bin/bash
 
 set -e
 
 # get the root of the git repository (requires git to be installed)
-GIT_ROOT=`realpath -m ./$(git rev-parse --show-cdup)`
+GIT_ROOT=`git rev-parse --show-toplevel`
 cd $GIT_ROOT/installation/
 
-# initialize package name variables
-source packages.sh
+# define useful variables
+source env.sh
 
 # do not uninstall the useful tools