From dc90bbad2e131fb70fed810b53966918f27993d9 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Mon, 30 Mar 2026 09:04:35 -0400 Subject: Use sub shells to isolate func variables --- setup-drive.sh | 24 ++++++++++++------------ setup-tailscale.sh | 36 ++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/setup-drive.sh b/setup-drive.sh index f678178..2fdd714 100755 --- a/setup-drive.sh +++ b/setup-drive.sh @@ -24,23 +24,23 @@ usage() { exit 0 } -ensure_fstab_entry() { - _fstab_uuid="${FSTAB_UUID:-2c882f17-50e7-4099-a305-693f4aa0113b}" - _fstab_mount_point="${FSTAB_MOUNT_POINT:-/mnt/media}" - _fstab_fs_type="${FSTAB_FS_TYPE:-xfs}" - _fstab_options="defaults" - _fstab_dump="0" - _fstab_pass="2" - _fstab_entry="UUID=${_fstab_uuid} ${_fstab_mount_point} ${_fstab_fs_type} ${_fstab_options} ${_fstab_dump} ${_fstab_pass}" +ensure_fstab_entry() ( + fstab_uuid="${FSTAB_UUID:-2c882f17-50e7-4099-a305-693f4aa0113b}" + fstab_mount_point="${FSTAB_MOUNT_POINT:-/mnt/media}" + fstab_fs_type="${FSTAB_FS_TYPE:-xfs}" + fstab_options="defaults" + fstab_dump="0" + fstab_pass="2" + fstab_entry="UUID=${fstab_uuid} ${fstab_mount_point} ${fstab_fs_type} ${fstab_options} ${fstab_dump} ${fstab_pass}" - if ! grep -q "UUID=${_fstab_uuid}" /etc/fstab; then + if ! grep -q "UUID=${fstab_uuid}" /etc/fstab; then echo "Adding mount entry to /etc/fstab..." - echo "${_fstab_entry}" | sudo tee -a /etc/fstab >/dev/null + echo "${fstab_entry}" | sudo tee -a /etc/fstab >/dev/null echo "Creating mount point if it doesn't exist..." - sudo mkdir -p "${_fstab_mount_point}" + sudo mkdir -p "${fstab_mount_point}" else echo "Mount entry already exists in /etc/fstab" fi -} +) main "$@" diff --git a/setup-tailscale.sh b/setup-tailscale.sh index 9c360ab..6c444eb 100755 --- a/setup-tailscale.sh +++ b/setup-tailscale.sh @@ -22,27 +22,27 @@ usage() { exit 0 } -install_tailscale_gpg_key() { - _pkg_url=$(_get_tailscale_ubuntu_pkg_url) - _download_file "${_pkg_url}.noarmor.gpg" "/usr/share/keyrings/tailscale-archive-keyring.gpg" -} +install_tailscale_gpg_key() ( + pkg_url=$(_get_tailscale_ubuntu_pkg_url) + _download_file "${pkg_url}.noarmor.gpg" "/usr/share/keyrings/tailscale-archive-keyring.gpg" +) -add_tailscale_repository() { - _pkg_url=$(_get_tailscale_ubuntu_pkg_url) - _download_file "${_pkg_url}.tailscale-keyring.list" "/etc/apt/sources.list.d/tailscale.list" -} +add_tailscale_repository() ( + pkg_url=$(_get_tailscale_ubuntu_pkg_url) + _download_file "${pkg_url}.tailscale-keyring.list" "/etc/apt/sources.list.d/tailscale.list" +) -_get_tailscale_ubuntu_pkg_url() { +_get_tailscale_ubuntu_pkg_url() ( # shellcheck disable=SC1091 - _codename=$(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") - echo "https://pkgs.tailscale.com/stable/ubuntu/${_codename}" -} - -_download_file() { - _url="$1" - _fs_location="$2" - sudo curl --fail --silent --show-error --location "$_url" --output "$_fs_location" -} + codename=$(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") + echo "https://pkgs.tailscale.com/stable/ubuntu/${codename}" +) + +_download_file() ( + url="$1" + fs_location="$2" + sudo curl --fail --silent --show-error --location "$url" --output "$fs_location" +) install_tailscale() { sudo apt-get update -- cgit v1.2.3