From 6d8bcff453bca8f4d356df8d42eda0b17babc5d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkrueger@mgit.at>
Date: Mon, 18 Mar 2024 03:22:39 +0100
Subject: [PATCH] fix: profile script

---
 unify/src-path/etc/profile.d/unify.sh      | 11 +++++------
 unify/src-script/modules/shareNetworkd.ysh |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/unify/src-path/etc/profile.d/unify.sh b/unify/src-path/etc/profile.d/unify.sh
index c3efe6a..7a49a6d 100755
--- a/unify/src-path/etc/profile.d/unify.sh
+++ b/unify/src-path/etc/profile.d/unify.sh
@@ -1,10 +1,11 @@
 # shellcheck shell=sh
 
+if [ -n "${__ETC_PROFILE_NIX_UNIFY_SOURCED:-}" ]; then return; fi
+__ETC_PROFILE_NIX_UNIFY_SOURCED=1
+
 # Expand $PATH to include the directory where nixos applications go.
 nix_bin_path="/run/current-system/sw/bin"
-if [ -n "${PATH##*${nix_bin_path}}" ] && [ -n "${PATH##*${nix_bin_path}:*}" ]; then
-    export PATH="$PATH:${nix_bin_path}"
-fi
+export PATH="$PATH:${nix_bin_path}"
 
 # Ensure base distro defaults xdg path are set if nothing filed up some
 # defaults yet.
@@ -16,6 +17,4 @@ fi
 # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for
 # nixos applications' desktop files.
 nix_xdg_path="/run/current-system/sw/share"
-if [ -n "${XDG_DATA_DIRS##*${nix_xdg_path}}" ] && [ -n "${XDG_DATA_DIRS##*${nix_xdg_path}:*}" ]; then
-    export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${nix_xdg_path}"
-fi
+export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${nix_xdg_path}"
diff --git a/unify/src-script/modules/shareNetworkd.ysh b/unify/src-script/modules/shareNetworkd.ysh
index 51b128e..a29e53d 100644
--- a/unify/src-script/modules/shareNetworkd.ysh
+++ b/unify/src-script/modules/shareNetworkd.ysh
@@ -1,4 +1,4 @@
-module sharenetworkd || return
+module sharenNtworkd || return
 
 proc describe(; ; cfg) {
   d_t "share networkd"