From 409b8e50f6e6b43e2e364bfba50a8e3cbe73d278 Mon Sep 17 00:00:00 2001 From: Alex Tavarez Date: Wed, 17 Sep 2025 12:55:16 -0400 Subject: [PATCH] Abstracted dataset creation from within function to separate function --- zfs/zfs-media-drive.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/zfs/zfs-media-drive.sh b/zfs/zfs-media-drive.sh index 2f28748..8fcd62c 100644 --- a/zfs/zfs-media-drive.sh +++ b/zfs/zfs-media-drive.sh @@ -29,32 +29,31 @@ create_zpool () { /dev/disk/by-id/"${1}" } +mkdataset () { + mkdir -p "$1" + sudo zfs create -o mountpoint="$1" "$2" +} + create_datasets () { DATASET=("${HOME}/Documents/.calibre" "${1}/LITERATURE") - mkdir -p "${DATASET[0]}" - sudo zfs create -o mountpoint="${DATASET[0]}" "${DATASET[1]}" + mkdataset "${DATASET[0]}" "${DATASET[1]}" DATASET=("${HOME}/Videos" "${1}/FILM") - mkdir -p "${DATASET[0]}" - sudo zfs create -o mountpoint="${DATASET[0]}" "${DATASET[1]}" + mkdataset "${DATASET[0]}" "${DATASET[1]}" DATASET=("${HOME}/.var/app/com.valvesoftware.Steam" "${1}/STEAMGAMES") - mkdir -p "${DATASET[0]}" - sudo zfs create -o mountpoint="${DATASET[0]}" "${DATASET[1]}" + mkdataset "${DATASET[0]}" "${DATASET[1]}" DATASET=("${HOME}/.var/app/org.libretro.RetroArch" "${1}/RARCHGAMES") - mkdir -p "${DATASET[0]}" - sudo zfs create -o mountpoint="${DATASET[0]}" "${DATASET[1]}" + mkdataset "${DATASET[0]}" "${DATASET[1]}" DATASET=("${HOME}/Games" "${1}/GAMES") - mkdir -p "${DATASET[0]}" - sudo zfs create -o mountpoint="${DATASET[0]}" "${DATASET[1]}" + mkdataset "${DATASET[0]}" "${DATASET[1]}" ln -s "${HOME}/.var/app/com.valvesoftware.Steam" "${DATASET[0]}/Steam" ln -s "${HOME}/.var/app/org.libretro.RetroArch" "${DATASET[0]}/libRetro" DATASET=("${HOME}/.var/app/org.libretro.RetroArch" "${1}/RARCHGAMES") - mkdir -p "${DATASET[0]}" - sudo zfs create -o mountpoint="${DATASET[0]}" "${DATASET[1]}" + mkdataset "${DATASET[0]}" "${DATASET[1]}" DATASET=("${HOME}/.XXX" "${1}/XXX") mkdir -p "${DATASET[0]}"