From 80f113cc4c24bd05ad6df20a4e4d2f42ca885ace Mon Sep 17 00:00:00 2001
From: m-sz <marcin.szymczak@golem.network>
Date: Mon, 30 Dec 2024 15:55:58 +0100
Subject: [PATCH] Improve cross-compatibility of used dependencies

Some of the tools used during the image creation process
were executed based on their absolute path (eg. /sbin),
which might not be the case. Changed them to just use
the executable's name.

Changed scripts shebang to use the more generic
`#!/usr/bin/env bash` to accomodate different OSes.
---
 Makefile             |  1 +
 create-live-image.sh | 14 +++++++-------
 get-merged-rootfs.sh |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index e56bef0..eb297e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+.PHONY: all clean
 
 LOCAL_DIR ?= $(shell readlink -m $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
 WORK_DIR ?= $(LOCAL_DIR)/work
diff --git a/create-live-image.sh b/create-live-image.sh
index 5609692..72d91ba 100755
--- a/create-live-image.sh
+++ b/create-live-image.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -eux -o pipefail
 
@@ -33,7 +33,7 @@ trap "cleanup ${MNTDIR}" 0 1 2 3 6 15
 truncate -s 16G "${IMG}"
 
 # have static UUIDs to make partition table reproducible
-/usr/sbin/sfdisk "$IMG" <<EOF || exit 1
+sfdisk "$IMG" <<EOF || exit 1
 label: gpt
 label-id: f4796a2a-e377-45bd-b539-d6d49e569055
 
@@ -44,7 +44,7 @@ size=10000MiB, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=693244e6-3e07-47b
 type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=9b06e23f-74bb-4c49-b83d-d3b0c0c2bb01, name="Golem storage"
 EOF
 
-IMG_LOOP=$(/sbin/losetup -P -f --show "$IMG")
+IMG_LOOP=$(losetup -P -f --show "$IMG")
 EFI_IMG_DEV=${IMG_LOOP}p1
 BIOS_IMG_DEV=${IMG_LOOP}p2
 CONF_DEV=${IMG_LOOP}p3
@@ -54,10 +54,10 @@ STORAGE_DEV=${IMG_LOOP}p5
 udevadm settle --exit-if-exists="$IMG_DEV"
 
 # Creating filesystems
-/sbin/mkfs.vfat "${EFI_IMG_DEV}"
-/sbin/mkfs.fat -F32 "${CONF_DEV}"
-/sbin/mkfs.ext4 -U 90a495f3-c8ce-45c6-97ac-3bd5edf3aebd -q -F "${IMG_DEV}"
-/sbin/mkfs.ext4 -q -F "${STORAGE_DEV}"
+mkfs.vfat "${EFI_IMG_DEV}"
+mkfs.fat -F32 "${CONF_DEV}"
+mkfs.ext4 -U 90a495f3-c8ce-45c6-97ac-3bd5edf3aebd -q -F "${IMG_DEV}"
+mkfs.ext4 -q -F "${STORAGE_DEV}"
 
 mkdir -p "${MNTDIR}"
 mount "${IMG_DEV}" "${MNTDIR}"
diff --git a/get-merged-rootfs.sh b/get-merged-rootfs.sh
index f7b0173..35981a2 100755
--- a/get-merged-rootfs.sh
+++ b/get-merged-rootfs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Command-line tool that simplifies the process of extracting Docker images
 # and their root filesystem layers. It saves provided image to a tarball and then