amend env check to include values, use pathmunge

neeasade · Oct 27, 2019 · d57d571 · d57d571
1 parent bd4df9d
commit d57d571
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/shell/.sh.d/environment b/shell/.sh.d/environment
@@ -15,6 +15,12 @@ iif() {
   eval $1 >/dev/null && echo -n "${2-true}" || echo -n "${3-false}"
 }
 
+pathmunge () {
+  if ! echo $PATH | egrep -q "(^|:)$1($|:)" ; then
+    PATH=$PATH:$1
+  fi
+}
+
 set_editor() {
   export EDITOR="$@"
   export GIT_EDITOR="$@"
@@ -63,7 +69,7 @@ PAGER="less"
 # fi
 
 NODE_PATH="$HOME/.npm-packages/lib/node_modules"
-PATH="$PATH:$HOME/.npm-packages/bin"
+pathmunge "$HOME/.npm-packages/bin"
 
 GEM_HOME="$HOME/.gem"
 BUNDLE_PATH="$HOME/.gem"
@@ -74,7 +80,7 @@ if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then
 fi 
 
 succ() {
-  PATH="$HOME/$@:$PATH"
+  pathmunge "$HOME/$@"
 }
 
 XDG_CONFIG_HOME=$HOME/.config

diff --git a/shell/.sh.d/functions b/shell/.sh.d/functions
@@ -39,7 +39,7 @@ shot() {
 }
 
 shellshot() {
-  eval echo "$(elisp '(ns/windowshot)')" | pb 0x0
+  eval printf "$(elisp '(ns/windowshot)' | sed 's/%/%%/g')" | pb 0x0
 }
 
 fullshot() {

diff --git a/shell/.sh.d/style b/shell/.sh.d/style
@@ -55,13 +55,10 @@ env_prompt() {
     return
   fi
 
-  standard_env=$(bash -i -c 'compgen -v')
   changed_vars=$(diff \
-                   <(grep -vE '^BASH_' <<< "$standard_env") \
-                   <(compgen -v | grep -vE '^(BASH_|standard_env|changed_vars|FUNCNAME)') \
-                   | grep '^> ' | sed 's/> //')
-
-  changed_vars=$(echo "$changed_vars" | grep -E '^[A-Z]+$')
+                   <(bash -ic '(set -o posix; set | grep -vE "^BASH_")') \
+                   <((set -o posix; set) | grep -vE '^(BASH_|changed_vars|FUNCNAME|PPID|SHLVL)') \
+                   | grep '^> ' | sed 's/> //' | grep -oE '^[A-Z]+\=')
 
   if [ ! -z "$changed_vars" ]; then
     echo "E "
@@ -73,7 +70,7 @@ envv() {
   env_prompt >/dev/null
 
   for v in $changed_vars; do
-    printf '%s=%q\n' $v "$(eval "echo \"\${${v}}\"")"
+    printf '%s%q\n' $v "$(eval "echo \"\${${v}}\"")"
   done
 }