From 5f15527d56ffec589f6341c20d4f53172747ebba Mon Sep 17 00:00:00 2001 From: "tlimoncelli@stackexchange.com" Date: Fri, 12 Sep 2014 16:32:27 +0000 Subject: [PATCH] Rewrite profile.d-usrblackbox.sh to only use BASH built-ins; retain file size <132 so that it is an "inline" file. --- tools/profile.d-usrblackbox-test.sh | 6 +++--- tools/profile.d-usrblackbox.sh | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/profile.d-usrblackbox-test.sh b/tools/profile.d-usrblackbox-test.sh index df89f9b..991787d 100755 --- a/tools/profile.d-usrblackbox-test.sh +++ b/tools/profile.d-usrblackbox-test.sh @@ -9,8 +9,8 @@ # in weird places (front, middle, or both). # To run the test: -# bash tools/profile.d-usrblackbox-test.sh | fgrep --color /usr/blackbox/bin -# sh profile.d-usrblackbox-test.sh | fgrep --color /usr/blackbox/bin +# bash tools/profile.d-usrblackbox-test.sh | fgrep --color /usr/blackbox/bin +# sh tools/profile.d-usrblackbox-test.sh | fgrep --color /usr/blackbox/bin # NOTE: profile.d-usrblackbox.sh is written to be so small that it fits as an "inline" file. # https://lwn.net/Articles/468678/ @@ -22,7 +22,7 @@ for p in \ '/usr/blackbox/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin' \ '/usr/local/bin:/bin:/usr/blackbox/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin' \ '/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/blackbox/bin' \ - '/Apple spaces/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin' \ + '/Apple spaces/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin' \ ; do export PATH="$p" diff --git a/tools/profile.d-usrblackbox.sh b/tools/profile.d-usrblackbox.sh index 9a7f51b..8b63698 100644 --- a/tools/profile.d-usrblackbox.sh +++ b/tools/profile.d-usrblackbox.sh @@ -1,6 +1,4 @@ x=/usr/blackbox/bin -if type pathmunge >/dev/null 2>&1;then +if type pathmunge>/dev/null 2>&1;then pathmunge $x -elif ! grep -sqF :$x:<<<":$PATH:";then -PATH="$x:$PATH" -fi \ No newline at end of file +else case ":$PATH:" in *:$x:*);;*)PATH="$x:$PATH";;esac;fi \ No newline at end of file