diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-06-23 15:46:53 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-06-23 15:46:53 +0100 |
| commit | 34a1bc6b32d5a1e61bd4f23be72372b8b081185e (patch) | |
| tree | 3bfda37fb808a40e377f932dc2ee02c6ae0c28be | |
| parent | a125b0307c659c135c7ffe8b48d79dd702c8b422 (diff) | |
| parent | 888749447b7108e10e67f87e6898977c0d0bfa94 (diff) | |
Merge branch 'hotfix/0.21.0.39'0.21.0.39
| -rw-r--r-- | config/initializers/alaveteli.rb | 2 | ||||
| -rwxr-xr-x | script/handle-mail-replies | 2 | ||||
| -rwxr-xr-x | script/mailin | 2 |
3 files changed, 3 insertions, 3 deletions
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): 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 |