X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=ac708df3f2ae9de03e7a428ff8dcdbc3329f986e;hb=75c2d52632eac5470a48d9b44feb336474a187d8;hp=465a864c90f06e720aaa2b437186148000f4756b;hpb=a54f24a9ec3bef2bb51e0b2a31f19455c8e2eb60;p=feisty_meow.git diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 465a864c..ac708df3 100644 --- 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 HISTFILESIZE=2000000 +export HISTFILESIZE=8000000 ############## @@ -100,10 +100,8 @@ if [ -z "$NECHUNG" ]; then # 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. @@ -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 - PERLLIB+=":$i" + PERLLIB+=":$(dos_to_unix_path $i)" 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 - # 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() @@ -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. - export PATH="$BINDIR:$PATH" + export PATH="$(dos_to_unix_path $BINDIR):$PATH" # 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 } @@ -177,7 +177,7 @@ if [ -z "$NECHUNG" ]; then # add to the PATH variables used for locating applications. this step is taken after any # potential overrides from the user. - export PATH="$FEISTY_MEOW_GENERATED:$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin" + 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" ##############