mostly fixes, some new scripts

[distro-setup] / filesystem / etc / profile.d / environment.sh

diff --git a/filesystem/etc/profile.d/environment.sh b/filesystem/etc/profile.d/environment.sh
index df276659f6cf683d4206d308cc05de26ef4bcb1c..d5c7e57f13f1fa5230270124bd1009cdf4de441a 100644 (file)
--- a/filesystem/etc/profile.d/environment.sh
+++ b/filesystem/etc/profile.d/environment.sh
@@ -1,7 +1,11 @@
 #!/bin/sh
 if [ -f $HOME/path-add-function ]; then
   . $HOME/path-add-function
-  path-add /usr/sbin /usr/local/sbin /sbin /a/exe /a/opt/bin
+  path-add /usr/sbin /usr/local/sbin /a/exe /a/opt/bin
+  # if usr merge, dont need it
+  if [[ ! -L /sbin ]]; then
+    path-add /sbin
+  fi
   path-add --end $HOME/.cabal/bin
   path-add --end /snap/bin