From eed8b64bdbdcc69dc8ea44a9d69af830d6970573 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 18 Jun 2015 18:05:04 +0100 Subject: Use BASH_SOURCE to return the script path. It is reliable in the case where the script is sourced from another script. --- script/handle-mail-replies | 2 +- script/mailin | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/handle-mail-replies b/script/handle-mail-replies index 15454b311..267ad5632 100755 --- a/script/handle-mail-replies +++ b/script/handle-mail-replies @@ -1,4 +1,4 @@ #!/bin/bash -cd "`dirname "$0"`" +cd "`dirname "${BASH_SOURCE[0]}"`" exec bundle exec ./handle-mail-replies.rb "$@" diff --git a/script/mailin b/script/mailin index 65f9d06f2..f6b7d1194 100755 --- a/script/mailin +++ b/script/mailin @@ -8,7 +8,7 @@ OUTPUT=$(mktemp -t foi-mailin-output-XXXXXXXX) # Read the email message from stdin, and write it to the file $INPUT cat >"$INPUT" -cd "$(dirname "$0")"/.. +cd "$(dirname "${BASH_SOURCE[0]}")"/.. source commonlib/shlib/deployfns read_conf config/general -- cgit v1.2.3 From 888749447b7108e10e67f87e6898977c0d0bfa94 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 23 Jun 2015 15:44:16 +0100 Subject: Bump Alaveteli version --- config/initializers/alaveteli.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index f2300d117..dca7ac073 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -10,7 +10,7 @@ load "debug_helpers.rb" load "util.rb" # Application version -ALAVETELI_VERSION = '0.21.0.38' +ALAVETELI_VERSION = '0.21.0.39' # Add new inflection rules using the following format # (all these examples are active by default): -- cgit v1.2.3