X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=7c67e440fb270d412784e41ab44fb9c445629b2a;hb=541783feb1e22d7cb43141640bc45e5d8f5fe8da;hp=f40dfc4f81dc76486b5f320fb4b7bb030e33ac28;hpb=223b6d85cccfb8582f7fa610a9cb482284abad49;p=feisty_meow.git diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index f40dfc4f..7c67e440 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -37,6 +37,22 @@ if [ -z "$NECHUNG" ]; then fi export IS_DARWIN=$(echo $OSTYPE | grep -i darwin) + ############## + + # guess the current platform. + IS_UNIX=$(uname | grep -i linux) + if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i unix); fi + if [ -z "$IS_UNIX" ]; then IS_UNIX=$(uname | grep -i darwin); fi + IS_DOS=$(uname | grep -i ming) + if [ -z "$IS_DOS" ]; then IS_DOS=$(uname | grep -i cygwin); fi + + # now if we're stuck in DOS, try to determine the type of system. + if [ ! -z "$IS_DOS" ]; then + # IS_MSYS will be non-empty if this is the msys toolset. otherwise + # we assume that it's cygwin. + IS_MSYS=$(uname | grep -i ming) + fi + ############## # fallbacks to set crucial variables for feisty meow... @@ -159,11 +175,9 @@ if [ -z "$NECHUNG" ]; then ############## - # set the path for locating applications. this is done after any + # add to the PATH variables used for locating applications. this step is taken after any # potential overrides from the user. - #export PATH="$(dos_to_msys_path $BINDIR):$(dos_to_msys_path $FEISTY_MEOW_GENERATED):$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:." - export PATH="$FEISTY_MEOW_GENERATED:$PATH:/sbin:." -###noise! :/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:. + export PATH="$FEISTY_MEOW_GENERATED:$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin" ##############