# HG changeset patch # User smith@nwoca.org # Date 1499289126 -3600 # Node ID c029be781d13343eb75c0cee8514419323ecc0c9 # Parent 923c2b21fac7f494668e38627e409f91721917d5 DEP-12: handle symlinks in home discovery diff -r 923c2b21fac7 -r c029be781d13 init.sh --- a/init.sh Fri Jun 16 17:14:16 2017 +0100 +++ b/init.sh Wed Jul 05 22:12:06 2017 +0100 @@ -1,6 +1,14 @@ #!/bin/bash -source "$( dirname "${BASH_SOURCE[0]}")/scripts/.functions.sh" +getSsdtHomeDir() { + SOURCE="${BASH_SOURCE[0]}" + while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done + echo $( cd $( dirname $SOURCE) && pwd ) +} + +echo ${BASH_SOURCE[*]} +export SSDT_HOME=$(getSsdtHomeDir) +export SSDT_SCRIPTS=${SSDT_HOME}/scripts +echo "ssdt_home $SSDT_HOME ($SSDT_SCRIPTS)" +source "${SSDT_SCRIPTS}/.functions.sh" alias utils='docker run -it -v ${PWD}:/tmp -v $SSDT_HOME:/ssdt --rm docker.ssdt.io/ssdt-utils' -alias send2ssdt='/ssdt/scripts/send.sh' - -export PATH=$PATH:$SSDT_HOME/scripts +alias send2ssdt='${SSDT_SCRIPTS}/send.sh' diff -r 923c2b21fac7 -r c029be781d13 scripts/.functions.sh --- a/scripts/.functions.sh Fri Jun 16 17:14:16 2017 +0100 +++ b/scripts/.functions.sh Wed Jul 05 22:12:06 2017 +0100 @@ -1,6 +1,16 @@ #!/bin/bash -export SSDT_SCRIPTS=$(dirname "${BASH_SOURCE[0]}") -export SSDT_HOME=$(dirname $SSDT_SCRIPTS) + +getScriptDir() { + SOURCE="${BASH_SOURCE[0]}" + while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done + echo $( cd $( dirname $SOURCE) && pwd ) +} + +if [ "$SSDT_HOME" == "" ] +then + export SSDT_SCRIPTS=$(getScriptDir) + export SSDT_HOME=$(dirname $SSDT_SCRIPTS) +fi # deletes psql data from specified service resetDbVolume() {