projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more fixes from windows.
[feisty_meow.git]
/
scripts
/
core
/
variables.sh
diff --git
a/scripts/core/variables.sh
b/scripts/core/variables.sh
index de83d76d6d320e07e14ff4b9153896241f9e902f..ac708df3f2ae9de03e7a428ff8dcdbc3329f986e 100644
(file)
--- a/
scripts/core/variables.sh
+++ b/
scripts/core/variables.sh
@@
-16,7
+16,7
@@
export PS1='\u@\h $ ';
# sets the history length and max file size so we can get some long history around here.
export HISTSIZE=1000000
export PS1='\u@\h $ ';
# sets the history length and max file size so we can get some long history around here.
export HISTSIZE=1000000
-export HISTFILESIZE=
2
000000
+export HISTFILESIZE=
8
000000
##############
##############
@@
-63,7
+63,7
@@
if [ -z "$NECHUNG" ]; then
if [ -z "$FEISTY_MEOW_DIR" ]; then
if [ -d "$HOME/feisty_meow" ]; then
export FEISTY_MEOW_DIR="$HOME/feisty_meow"
if [ -z "$FEISTY_MEOW_DIR" ]; then
if [ -d "$HOME/feisty_meow" ]; then
export FEISTY_MEOW_DIR="$HOME/feisty_meow"
- export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_
DIR/scripts
"
+ export FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_
SCRIPTS
"
fi
fi
fi
fi
@@
-79,8
+79,8
@@
if [ -z "$NECHUNG" ]; then
##############
# umask sets a permission mask for all file creations. the mask used here
##############
# umask sets a permission mask for all file creations. the mask used here
- # disallows writ
ing by the "group" and "others" categories
.
- umask 02
2
+ # disallows writ
es by the "group" and disallows "others" completely
.
+ umask 02
7
# ulimit sets user limits. we set the maximum allowed core dump file size
# to zero, because it is obnoxious to see the core dumps from crashed
# programs lying around everywhere.
# ulimit sets user limits. we set the maximum allowed core dump file size
# to zero, because it is obnoxious to see the core dumps from crashed
# programs lying around everywhere.
@@
-100,10
+100,8
@@
if [ -z "$NECHUNG" ]; then
# variables for perl.
# variables for perl.
- export PERLLIB
- if [ "$OS" != "Windows_NT" ]; then
- PERLLIB+="/usr/lib/perl5"
- else
+ export PERLLIB+="/usr/lib/perl5"
+ if [ "$OS" == "Windows_NT" ]; then
export PERLIO=:perlio
# choose perl's IO over the ms-windows version so we can handle file
# bytes properly.
export PERLIO=:perlio
# choose perl's IO over the ms-windows version so we can handle file
# bytes properly.
@@
-116,7
+114,7
@@
if [ -z "$NECHUNG" ]; then
# check if there is a perl file present; add the folder to PERLLIB if so.
ls $i/*.pl &>/dev/null
if [ $? -eq 0 ]; then
# check if there is a perl file present; add the folder to PERLLIB if so.
ls $i/*.pl &>/dev/null
if [ $? -eq 0 ]; then
- PERLLIB+=":$
i
"
+ PERLLIB+=":$
(dos_to_unix_path $i)
"
fi
fi
done
fi
fi
done
@@
-132,8
+130,10
@@
if [ -z "$NECHUNG" ]; then
export GIT_SSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
# the base checkout list is just to update feisty_meow. additional folder
export GIT_SSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
# the base checkout list is just to update feisty_meow. additional folder
- # names can be added in your customized scripts.
- export REPOSITORY_LIST="feisty_meow"
+ # names can be added in your customized scripts. the space at the end of
+ # this variable is important and allows users to extend the list like:
+ # export REPOSITORY_DIR+="muppets configs"
+ export REPOSITORY_LIST="feisty_meow "
# initializes the feisty meow build variables, if possible.
function initialize_build_variables()
# initializes the feisty meow build variables, if possible.
function initialize_build_variables()
@@
-142,7
+142,7
@@
if [ -z "$NECHUNG" ]; then
# we need to know the feisty meow directory, or we bail.
if [ -z "$FEISTY_MEOW_DIR" ]; then return; fi
# pick from our expected generator folder, but make sure it's there...
# we need to know the feisty meow directory, or we bail.
if [ -z "$FEISTY_MEOW_DIR" ]; then return; fi
# pick from our expected generator folder, but make sure it's there...
- buildvars="$FEISTY_MEOW_
DIR/scripts
/generator/build_variables.sh"
+ buildvars="$FEISTY_MEOW_
SCRIPTS
/generator/build_variables.sh"
if [ -f "$buildvars" ]; then
# yep, that one looks good, so pull in the build defs.
source "$buildvars" "$buildvars"
if [ -f "$buildvars" ]; then
# yep, that one looks good, so pull in the build defs.
source "$buildvars" "$buildvars"
@@
-154,9
+154,9
@@
if [ -z "$NECHUNG" ]; then
# up the path to it here based on the operating system.
export BINDIR=$FEISTY_MEOW_DIR/production/binaries
# add binaries created within build to the path.
# up the path to it here based on the operating system.
export BINDIR=$FEISTY_MEOW_DIR/production/binaries
# add binaries created within build to the path.
- export PATH="$
BINDIR
:$PATH"
+ export PATH="$
(dos_to_unix_path $BINDIR)
:$PATH"
# Shared libraries are located via this variable.
# Shared libraries are located via this variable.
- export LD_LIBRARY_PATH="$
LD_LIBRARY_PATH:$BINDIR
"
+ export LD_LIBRARY_PATH="$
(dos_to_unix_path $LD_LIBRARY_PATH):$(dos_to_unix_path $BINDIR)
"
fi
}
fi
}
@@
-175,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.
# potential overrides from the user.
- #export PATH="$(dos_to_unix_path $BINDIR):$(dos_to_unix_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="$(dos_to_unix_path $FEISTY_MEOW_GENERATED):$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin"
##############
##############