Moving anduril_env

This commit is contained in:
ville rantanen
2014-04-10 10:22:24 +03:00
parent 8625ffd68c
commit c2adab2802
3 changed files with 19 additions and 12 deletions

View File

@@ -5,12 +5,14 @@ function return_error {
exit 1 exit 1
} }
if [ -f "$HOME/Documents/anduril_environment.sh" ] ANDURIL_ENV=$HOME/.config/anduril/environment
then . "$HOME/Documents/anduril_environment.sh"
echo Read HOME/Documents/anduril_environment.sh if [ -f "$ANDURIL_ENV" ]
then . "$ANDURIL_ENV"
echo Read "$ANDURIL_ENV"
fi fi
[ -d "$ANDURIL_HOME" ] || return_error "ANDURIL_HOME is not set!" [ -d "$ANDURIL_HOME" ] || return_error "ANDURIL_HOME is not set! You may set it also in file: $ANDURIL_ENV"
[ -d "$ANDURIL_BUNDLES" ] || return_error "ANDURIL_BUNDLES is not set! (folder of bundles, may also be same as ANDURIL_HOME)" [ -d "$ANDURIL_BUNDLES" ] || return_error "ANDURIL_BUNDLES is not set! (folder of bundles, may also be same as ANDURIL_HOME)"
echo ANDURIL_HOME="$ANDURIL_HOME" echo ANDURIL_HOME="$ANDURIL_HOME"

View File

@@ -5,12 +5,14 @@ function return_error {
exit 1 exit 1
} }
if [ -f "$HOME/Documents/anduril_environment.sh" ] ANDURIL_ENV=$HOME/.config/anduril/environment
then . "$HOME/Documents/anduril_environment.sh"
echo Read HOME/Documents/anduril_environment.sh if [ -f "$ANDURIL_ENV" ]
then . "$ANDURIL_ENV"
echo Read "$ANDURIL_ENV"
fi fi
[ -d "$ANDURIL_HOME" ] || return_error "ANDURIL_HOME is not set!" [ -d "$ANDURIL_HOME" ] || return_error "ANDURIL_HOME is not set! You may set it also in file: $ANDURIL_ENV"
[ -d "$ANDURIL_BUNDLES" ] || return_error "ANDURIL_BUNDLES is not set! (folder of bundles, may also be same as ANDURIL_HOME)" [ -d "$ANDURIL_BUNDLES" ] || return_error "ANDURIL_BUNDLES is not set! (folder of bundles, may also be same as ANDURIL_HOME)"
echo ANDURIL_HOME="$ANDURIL_HOME" echo ANDURIL_HOME="$ANDURIL_HOME"

View File

@@ -5,14 +5,17 @@ function return_error {
exit 1 exit 1
} }
if [ -f "$HOME/Documents/anduril_environment.sh" ] ANDURIL_ENV=$HOME/.config/anduril/environment
then . "$HOME/Documents/anduril_environment.sh"
echo Read HOME/Documents/anduril_environment.sh if [ -f "$ANDURIL_ENV" ]
then . "$ANDURIL_ENV"
echo Read "$ANDURIL_ENV"
fi fi
[ -d "$ANDURIL_HOME" ] || return_error "ANDURIL_HOME is not set!" [ -d "$ANDURIL_HOME" ] || return_error "ANDURIL_HOME is not set! You may set it also in file: $ANDURIL_ENV"
[ -d "$ANDURIL_BUNDLES" ] || return_error "ANDURIL_BUNDLES is not set! (folder of bundles, may also be same as ANDURIL_HOME)" [ -d "$ANDURIL_BUNDLES" ] || return_error "ANDURIL_BUNDLES is not set! (folder of bundles, may also be same as ANDURIL_HOME)"
echo -n "Looking for bundles: " echo -n "Looking for bundles: "
b="$ANDURIL_HOME/builtin/bundle.xml" b="$ANDURIL_HOME/builtin/bundle.xml"
BUNDLESTRING=" -b $( readlink -f $( dirname ${b} ) )" BUNDLESTRING=" -b $( readlink -f $( dirname ${b} ) )"