summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Keller <jacob.e.keller@intel.com>2014-03-27 11:39:59 -0700
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2014-03-31 11:13:25 +0300
commitba0b22a4c1f36fe52c7f504c2add8c1563126694 (patch)
tree9ff542e8f5e8fae596f96697da16efd4025db976
parent4464b89635a17f8cbbd0576f860a3d1fb2166e56 (diff)
downloadaiaiai-ba0b22a4c1f36fe52c7f504c2add8c1563126694.tar.gz
aiaiai: fixup srcdir in email and gerrit scripts
$srcdir should represent the current directory where the actual shell file is located. This requires also updating $PATH so that it points to the correct directories. This is somewhat confusing since we have to add '..' to a section, but it fixes the switch to dash check for email scripts which previously was broken. It also makes everything more consistent. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
-rwxr-xr-xemail/aiaiai-email-dispatcher4
-rwxr-xr-xemail/aiaiai-email-dispatcher-helper4
-rwxr-xr-xemail/aiaiai-email-lda4
-rwxr-xr-xemail/aiaiai-email-test-patchset4
-rwxr-xr-xgerrit/aiaiai-jenkins-test-patchset4
5 files changed, 10 insertions, 10 deletions
diff --git a/email/aiaiai-email-dispatcher b/email/aiaiai-email-dispatcher
index d31e88e..caf66a8 100755
--- a/email/aiaiai-email-dispatcher
+++ b/email/aiaiai-email-dispatcher
@@ -4,8 +4,8 @@
# Author: Artem Bityutskiy
# License: GPLv2
-srcdir="$(readlink -ev -- ${0%/*}/..)"
-PATH="$srcdir/helpers:$srcdir/email:$srcdir/helpers/libshell:$PATH"
+srcdir="$(readlink -ev -- ${0%/*})"
+PATH="$srcdir:$srcdir/..:$srcdir/../helpers:$srcdir/../helpers/libshell:$PATH"
echo $PATH
. shell-error
diff --git a/email/aiaiai-email-dispatcher-helper b/email/aiaiai-email-dispatcher-helper
index 018c0d4..5b851cd 100755
--- a/email/aiaiai-email-dispatcher-helper
+++ b/email/aiaiai-email-dispatcher-helper
@@ -4,8 +4,8 @@
# Author: Artem Bityutskiy
# License: GPLv2
-srcdir="$(readlink -ev -- ${0%/*}/..)"
-PATH="$srcdir/helpers:$srcdir/email:$srcdir/libshell:$PATH"
+srcdir="$(readlink -ev -- ${0%/*})"
+PATH="$srcdir:$srcdir/..:$srcdir/../helpers:$srcdir/../helpers/libshell:$PATH"
. shell-error
. shell-signal
diff --git a/email/aiaiai-email-lda b/email/aiaiai-email-lda
index 5db3f15..8d65ae2 100755
--- a/email/aiaiai-email-lda
+++ b/email/aiaiai-email-lda
@@ -4,8 +4,8 @@
# Author: Artem Bityutskiy
# License: GPLv2
-srcdir="$(readlink -ev -- ${0%/*}/..)"
-PATH="$srcdir/helpers:$srcdir/email:$srcdir/helpers/libshell:$PATH"
+srcdir="$(readlink -ev -- ${0%/*})"
+PATH="$srcdir:$srcdir/..:$srcdir/../helpers:$srcdir/../helpers/libshell:$PATH"
. shell-error
. shell-args
diff --git a/email/aiaiai-email-test-patchset b/email/aiaiai-email-test-patchset
index 3a7eb77..c02b331 100755
--- a/email/aiaiai-email-test-patchset
+++ b/email/aiaiai-email-test-patchset
@@ -4,8 +4,8 @@
# Author: Artem Bityutskiy
# License: GPLv2
-srcdir="$(readlink -ev -- ${0%/*}/..)"
-PATH="$srcdir:$srcdir/helpers:$srcdir/email:$srcdir/helpers/libshell:$PATH"
+srcdir="$(readlink -ev -- ${0%/*})"
+PATH="$srcdir:$srcdir/..:$srcdir/../helpers:$srcdir/../helpers/libshell:$PATH"
. shell-error
. shell-args
diff --git a/gerrit/aiaiai-jenkins-test-patchset b/gerrit/aiaiai-jenkins-test-patchset
index 53da26e..629bfcb 100755
--- a/gerrit/aiaiai-jenkins-test-patchset
+++ b/gerrit/aiaiai-jenkins-test-patchset
@@ -4,8 +4,8 @@
# Author: Artem Bityutskiy
# License: GPLv2
-srcdir="$(readlink -ev -- ${0%/*}/..)"
-PATH="$srcdir:$srcdir/helpers/libshell:$PATH"
+srcdir="$(readlink -ev -- ${0%/*})"
+PATH="$srcdir:$srcdir/..:$srcdir/../helpers:$srcdir/../helpers/libshell:$PATH"
. shell-error
. shell-args