From: Artem Bityutskiy Date: Fri, 7 Feb 2014 12:20:35 +0000 (+0200) Subject: Rename 'external' to 'helpers' X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8ee954313c40ee5aad22c793543b0edab464d8b8;p=users%2Fdedekind%2Faiaiai.git Rename 'external' to 'helpers' I would like to move all the internal tools to a separate directory. Let's call it 'helpers'. The 'external' directory now contains all the tools which came from an external project. Probably this is not the best way to lay-out our files. Let's just re-name it to helpers. Later we'll move more stuff to 'helpers'. Signed-off-by: Artem Bityutskiy --- diff --git a/.gitignore b/.gitignore index ed57a6f..4361bc4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ aiaiai-locker -external/remap-log +helpers/remap-log diff --git a/Makefile b/Makefile index b97a353..a6c722c 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ CFLAGS = -O2 -g -Wextra all: $(CC) $(CFLAGS) -o aiaiai-locker aiaiai-locker.c - make -C external + make -C helpers clean: $(RM) aiaiai-locker - make -C external clean + make -C helpers clean diff --git a/aiaiai-checker b/aiaiai-checker index 5ca71c3..1c68efc 100755 --- a/aiaiai-checker +++ b/aiaiai-checker @@ -5,7 +5,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*})" -PATH="$srcdir:$srcdir/external/libshell:$srcdir/external:$PATH" +PATH="$srcdir:$srcdir/helpers/libshell:$srcdir/helpers:$PATH" . shell-error . shell-args diff --git a/aiaiai-concat-mboxes b/aiaiai-concat-mboxes index 9d0e847..350d986 100755 --- a/aiaiai-concat-mboxes +++ b/aiaiai-concat-mboxes @@ -5,7 +5,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*})" -PATH="$srcdir:$srcdir/external/libshell:$PATH" +PATH="$srcdir:$srcdir/helpers/libshell:$PATH" . shell-error diff --git a/aiaiai-diff-log b/aiaiai-diff-log index 55c2136..54228d9 100755 --- a/aiaiai-diff-log +++ b/aiaiai-diff-log @@ -6,7 +6,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*})" -PATH="$srcdir:$srcdir/external/libshell:$srcdir/external:$PATH" +PATH="$srcdir:$srcdir/helpers/libshell:$srcdir/helpers:$PATH" . shell-error . shell-args diff --git a/aiaiai-make-kernel b/aiaiai-make-kernel index 5ce11aa..3bb2f02 100755 --- a/aiaiai-make-kernel +++ b/aiaiai-make-kernel @@ -5,7 +5,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*})" -export PATH="$srcdir:$srcdir/external/libshell:$srcdir/external:$PATH" +export PATH="$srcdir:$srcdir/helpers/libshell:$srcdir/helpers:$PATH" . shell-error . shell-args diff --git a/aiaiai-match-keywords b/aiaiai-match-keywords index 701f459..bab7902 100755 --- a/aiaiai-match-keywords +++ b/aiaiai-match-keywords @@ -5,7 +5,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*})" -PATH="$srcdir:$srcdir/external/libshell:$PATH" +PATH="$srcdir:$srcdir/helpers/libshell:$PATH" . shell-error . shell-args diff --git a/aiaiai-test-bisectability b/aiaiai-test-bisectability index 121312a..ffc0f55 100755 --- a/aiaiai-test-bisectability +++ b/aiaiai-test-bisectability @@ -5,7 +5,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*})" -PATH="$srcdir:$srcdir/external/libshell:$srcdir/external:$PATH" +PATH="$srcdir:$srcdir/helpers/libshell:$srcdir/helpers:$PATH" . shell-error . shell-args diff --git a/aiaiai-test-patchset b/aiaiai-test-patchset index b231d30..0707019 100755 --- a/aiaiai-test-patchset +++ b/aiaiai-test-patchset @@ -5,7 +5,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*})" -PATH="$srcdir:$srcdir/external/libshell:$srcdir/external:$PATH" +PATH="$srcdir:$srcdir/helpers/libshell:$srcdir/helpers:$PATH" . shell-error . shell-args diff --git a/doc/README b/doc/README index 1175f01..544d365 100644 --- a/doc/README +++ b/doc/README @@ -25,8 +25,9 @@ The layout of the repository. * aiaiai/email/ All the scripts related to emails handling. If you use Aiaiai locally you do not need these scripts. -* aiaiai/external/ - Some external tools and files which we use are stored here. +* aiaiai/helpers/ + Variouls programs and scripts which Aiaiai users should not usually use + directly. Instead, Aiaiai scripts use them internally. * aiaiai/doc Some documentation. * aiaiai/tests/ @@ -145,14 +146,14 @@ sends it back to the patch submitter. * aiaiai-diff-log Compares 2 build logs and provides the differences. This script used the - 'external/remap-log' tool to re-map line numbers in the warnings of the + 'helpers/remap-log' tool to re-map line numbers in the warnings of the first build log to correspond to line numbers in the second build-log. * aiaiai-diff-log-helper A helper script for aiaiai-diff-log which sorts 2 build logs and compares them. Written in Python because the shell version was too slow. -* external/remap-log +* helpers/remap-log This is a small C program originally written by Al Viro which helps comparing 2 build logs by remapping line numbers. Roughly speaking, 'remap-log' takes the build log of the pre-patched kernel and the patch and @@ -220,7 +221,7 @@ tool for comparing 2 build logs the smart way. If you just want to test a patch-set locally, you should use the 'aiaiai-test-patchset' script. Do not forget to build the remap-log.c file in -the 'external' subdirectory. +the 'helpers' subdirectory. Here are some examples. @@ -319,7 +320,7 @@ $ export PATH="$HOME/bin:$PATH" Coccinelle or "spatch" is a great semantic patch tool, very useful on its own. The Linux kernel contains a bunch of coccinelle semantic patches which catch various types of API abuses etc. We store a copy of these scripts in the -"external" subdirectory. +"helpers" subdirectory. The "spatch" tool is part of distributions like Debian and Fedora, so you most probably just need to install the corresponding package. The binary program is diff --git a/email/aiaiai-email-dispatcher b/email/aiaiai-email-dispatcher index 9fa7847..7487cd9 100755 --- a/email/aiaiai-email-dispatcher +++ b/email/aiaiai-email-dispatcher @@ -5,7 +5,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*}/..)" -PATH="$srcdir:$srcdir/email:$srcdir/external/libshell:$PATH" +PATH="$srcdir:$srcdir/email:$srcdir/helpers/libshell:$PATH" . shell-error . shell-args diff --git a/email/aiaiai-email-dispatcher-helper b/email/aiaiai-email-dispatcher-helper index 91722b0..7d0365d 100755 --- a/email/aiaiai-email-dispatcher-helper +++ b/email/aiaiai-email-dispatcher-helper @@ -5,7 +5,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*}/..)" -PATH="$srcdir:$srcdir/email:$srcdir/external/libshell:$PATH" +PATH="$srcdir:$srcdir/email:$srcdir/helpers/libshell:$PATH" . shell-error . shell-signal diff --git a/email/aiaiai-email-lda b/email/aiaiai-email-lda index 7489ffe..b9f2854 100755 --- a/email/aiaiai-email-lda +++ b/email/aiaiai-email-lda @@ -5,7 +5,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*}/..)" -PATH="$srcdir:$srcdir/email:$srcdir/external/libshell:$PATH" +PATH="$srcdir:$srcdir/email:$srcdir/helpers/libshell:$PATH" . shell-error . shell-args diff --git a/email/aiaiai-email-test-patchset b/email/aiaiai-email-test-patchset index af38bb5..aa76b71 100755 --- a/email/aiaiai-email-test-patchset +++ b/email/aiaiai-email-test-patchset @@ -5,7 +5,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*}/..)" -PATH="$srcdir:$srcdir/email:$srcdir/external/libshell:$PATH" +PATH="$srcdir:$srcdir/email:$srcdir/helpers/libshell:$PATH" . shell-error . shell-args diff --git a/gerrit/aiaiai-jenkins-test-patchset b/gerrit/aiaiai-jenkins-test-patchset index bc5c948..326268b 100755 --- a/gerrit/aiaiai-jenkins-test-patchset +++ b/gerrit/aiaiai-jenkins-test-patchset @@ -5,7 +5,7 @@ # License: GPLv2 srcdir="$(readlink -ev -- ${0%/*})" -PATH="$srcdir/..:$srcdir/../external/libshell:$PATH" +PATH="$srcdir/..:$srcdir/../helpers/libshell:$PATH" . shell-error . shell-args diff --git a/external/Makefile b/helpers/Makefile similarity index 100% rename from external/Makefile rename to helpers/Makefile diff --git a/external/coccinelle/api/alloc/drop_kmalloc_cast.cocci b/helpers/coccinelle/api/alloc/drop_kmalloc_cast.cocci similarity index 100% rename from external/coccinelle/api/alloc/drop_kmalloc_cast.cocci rename to helpers/coccinelle/api/alloc/drop_kmalloc_cast.cocci diff --git a/external/coccinelle/api/alloc/kzalloc-simple.cocci b/helpers/coccinelle/api/alloc/kzalloc-simple.cocci similarity index 100% rename from external/coccinelle/api/alloc/kzalloc-simple.cocci rename to helpers/coccinelle/api/alloc/kzalloc-simple.cocci diff --git a/external/coccinelle/api/d_find_alias.cocci b/helpers/coccinelle/api/d_find_alias.cocci similarity index 100% rename from external/coccinelle/api/d_find_alias.cocci rename to helpers/coccinelle/api/d_find_alias.cocci diff --git a/external/coccinelle/api/devm_ioremap_resource.cocci b/helpers/coccinelle/api/devm_ioremap_resource.cocci similarity index 100% rename from external/coccinelle/api/devm_ioremap_resource.cocci rename to helpers/coccinelle/api/devm_ioremap_resource.cocci diff --git a/external/coccinelle/api/devm_request_and_ioremap.cocci b/helpers/coccinelle/api/devm_request_and_ioremap.cocci similarity index 100% rename from external/coccinelle/api/devm_request_and_ioremap.cocci rename to helpers/coccinelle/api/devm_request_and_ioremap.cocci diff --git a/external/coccinelle/api/err_cast.cocci b/helpers/coccinelle/api/err_cast.cocci similarity index 100% rename from external/coccinelle/api/err_cast.cocci rename to helpers/coccinelle/api/err_cast.cocci diff --git a/external/coccinelle/api/kstrdup.cocci b/helpers/coccinelle/api/kstrdup.cocci similarity index 100% rename from external/coccinelle/api/kstrdup.cocci rename to helpers/coccinelle/api/kstrdup.cocci diff --git a/external/coccinelle/api/memdup.cocci b/helpers/coccinelle/api/memdup.cocci similarity index 100% rename from external/coccinelle/api/memdup.cocci rename to helpers/coccinelle/api/memdup.cocci diff --git a/external/coccinelle/api/memdup_user.cocci b/helpers/coccinelle/api/memdup_user.cocci similarity index 100% rename from external/coccinelle/api/memdup_user.cocci rename to helpers/coccinelle/api/memdup_user.cocci diff --git a/external/coccinelle/api/ptr_ret.cocci b/helpers/coccinelle/api/ptr_ret.cocci similarity index 100% rename from external/coccinelle/api/ptr_ret.cocci rename to helpers/coccinelle/api/ptr_ret.cocci diff --git a/external/coccinelle/api/resource_size.cocci b/helpers/coccinelle/api/resource_size.cocci similarity index 100% rename from external/coccinelle/api/resource_size.cocci rename to helpers/coccinelle/api/resource_size.cocci diff --git a/external/coccinelle/api/simple_open.cocci b/helpers/coccinelle/api/simple_open.cocci similarity index 100% rename from external/coccinelle/api/simple_open.cocci rename to helpers/coccinelle/api/simple_open.cocci diff --git a/external/coccinelle/free/clk_put.cocci b/helpers/coccinelle/free/clk_put.cocci similarity index 100% rename from external/coccinelle/free/clk_put.cocci rename to helpers/coccinelle/free/clk_put.cocci diff --git a/external/coccinelle/free/devm_free.cocci b/helpers/coccinelle/free/devm_free.cocci similarity index 100% rename from external/coccinelle/free/devm_free.cocci rename to helpers/coccinelle/free/devm_free.cocci diff --git a/external/coccinelle/free/iounmap.cocci b/helpers/coccinelle/free/iounmap.cocci similarity index 100% rename from external/coccinelle/free/iounmap.cocci rename to helpers/coccinelle/free/iounmap.cocci diff --git a/external/coccinelle/free/kfree.cocci b/helpers/coccinelle/free/kfree.cocci similarity index 100% rename from external/coccinelle/free/kfree.cocci rename to helpers/coccinelle/free/kfree.cocci diff --git a/external/coccinelle/free/kfreeaddr.cocci b/helpers/coccinelle/free/kfreeaddr.cocci similarity index 100% rename from external/coccinelle/free/kfreeaddr.cocci rename to helpers/coccinelle/free/kfreeaddr.cocci diff --git a/external/coccinelle/free/pci_free_consistent.cocci b/helpers/coccinelle/free/pci_free_consistent.cocci similarity index 100% rename from external/coccinelle/free/pci_free_consistent.cocci rename to helpers/coccinelle/free/pci_free_consistent.cocci diff --git a/external/coccinelle/iterators/fen.cocci b/helpers/coccinelle/iterators/fen.cocci similarity index 100% rename from external/coccinelle/iterators/fen.cocci rename to helpers/coccinelle/iterators/fen.cocci diff --git a/external/coccinelle/iterators/itnull.cocci b/helpers/coccinelle/iterators/itnull.cocci similarity index 100% rename from external/coccinelle/iterators/itnull.cocci rename to helpers/coccinelle/iterators/itnull.cocci diff --git a/external/coccinelle/iterators/list_entry_update.cocci b/helpers/coccinelle/iterators/list_entry_update.cocci similarity index 100% rename from external/coccinelle/iterators/list_entry_update.cocci rename to helpers/coccinelle/iterators/list_entry_update.cocci diff --git a/external/coccinelle/iterators/use_after_iter.cocci b/helpers/coccinelle/iterators/use_after_iter.cocci similarity index 100% rename from external/coccinelle/iterators/use_after_iter.cocci rename to helpers/coccinelle/iterators/use_after_iter.cocci diff --git a/external/coccinelle/locks/call_kern.cocci b/helpers/coccinelle/locks/call_kern.cocci similarity index 100% rename from external/coccinelle/locks/call_kern.cocci rename to helpers/coccinelle/locks/call_kern.cocci diff --git a/external/coccinelle/locks/double_lock.cocci b/helpers/coccinelle/locks/double_lock.cocci similarity index 100% rename from external/coccinelle/locks/double_lock.cocci rename to helpers/coccinelle/locks/double_lock.cocci diff --git a/external/coccinelle/locks/flags.cocci b/helpers/coccinelle/locks/flags.cocci similarity index 100% rename from external/coccinelle/locks/flags.cocci rename to helpers/coccinelle/locks/flags.cocci diff --git a/external/coccinelle/locks/mini_lock.cocci b/helpers/coccinelle/locks/mini_lock.cocci similarity index 100% rename from external/coccinelle/locks/mini_lock.cocci rename to helpers/coccinelle/locks/mini_lock.cocci diff --git a/external/coccinelle/misc/boolinit.cocci b/helpers/coccinelle/misc/boolinit.cocci similarity index 100% rename from external/coccinelle/misc/boolinit.cocci rename to helpers/coccinelle/misc/boolinit.cocci diff --git a/external/coccinelle/misc/boolreturn.cocci b/helpers/coccinelle/misc/boolreturn.cocci similarity index 100% rename from external/coccinelle/misc/boolreturn.cocci rename to helpers/coccinelle/misc/boolreturn.cocci diff --git a/external/coccinelle/misc/cstptr.cocci b/helpers/coccinelle/misc/cstptr.cocci similarity index 100% rename from external/coccinelle/misc/cstptr.cocci rename to helpers/coccinelle/misc/cstptr.cocci diff --git a/external/coccinelle/misc/doubleinit.cocci b/helpers/coccinelle/misc/doubleinit.cocci similarity index 100% rename from external/coccinelle/misc/doubleinit.cocci rename to helpers/coccinelle/misc/doubleinit.cocci diff --git a/external/coccinelle/misc/ifaddr.cocci b/helpers/coccinelle/misc/ifaddr.cocci similarity index 100% rename from external/coccinelle/misc/ifaddr.cocci rename to helpers/coccinelle/misc/ifaddr.cocci diff --git a/external/coccinelle/misc/ifcol.cocci b/helpers/coccinelle/misc/ifcol.cocci similarity index 100% rename from external/coccinelle/misc/ifcol.cocci rename to helpers/coccinelle/misc/ifcol.cocci diff --git a/external/coccinelle/misc/irqf_oneshot.cocci b/helpers/coccinelle/misc/irqf_oneshot.cocci similarity index 100% rename from external/coccinelle/misc/irqf_oneshot.cocci rename to helpers/coccinelle/misc/irqf_oneshot.cocci diff --git a/external/coccinelle/misc/memcpy-assign.cocci b/helpers/coccinelle/misc/memcpy-assign.cocci similarity index 100% rename from external/coccinelle/misc/memcpy-assign.cocci rename to helpers/coccinelle/misc/memcpy-assign.cocci diff --git a/external/coccinelle/misc/noderef.cocci b/helpers/coccinelle/misc/noderef.cocci similarity index 100% rename from external/coccinelle/misc/noderef.cocci rename to helpers/coccinelle/misc/noderef.cocci diff --git a/external/coccinelle/misc/orplus.cocci b/helpers/coccinelle/misc/orplus.cocci similarity index 100% rename from external/coccinelle/misc/orplus.cocci rename to helpers/coccinelle/misc/orplus.cocci diff --git a/external/coccinelle/misc/semicolon.cocci b/helpers/coccinelle/misc/semicolon.cocci similarity index 100% rename from external/coccinelle/misc/semicolon.cocci rename to helpers/coccinelle/misc/semicolon.cocci diff --git a/external/coccinelle/misc/warn.cocci b/helpers/coccinelle/misc/warn.cocci similarity index 100% rename from external/coccinelle/misc/warn.cocci rename to helpers/coccinelle/misc/warn.cocci diff --git a/external/coccinelle/null/badzero.cocci b/helpers/coccinelle/null/badzero.cocci similarity index 100% rename from external/coccinelle/null/badzero.cocci rename to helpers/coccinelle/null/badzero.cocci diff --git a/external/coccinelle/null/deref_null.cocci b/helpers/coccinelle/null/deref_null.cocci similarity index 100% rename from external/coccinelle/null/deref_null.cocci rename to helpers/coccinelle/null/deref_null.cocci diff --git a/external/coccinelle/null/eno.cocci b/helpers/coccinelle/null/eno.cocci similarity index 100% rename from external/coccinelle/null/eno.cocci rename to helpers/coccinelle/null/eno.cocci diff --git a/external/coccinelle/null/kmerr.cocci b/helpers/coccinelle/null/kmerr.cocci similarity index 100% rename from external/coccinelle/null/kmerr.cocci rename to helpers/coccinelle/null/kmerr.cocci diff --git a/external/coccinelle/tests/doublebitand.cocci b/helpers/coccinelle/tests/doublebitand.cocci similarity index 100% rename from external/coccinelle/tests/doublebitand.cocci rename to helpers/coccinelle/tests/doublebitand.cocci diff --git a/external/coccinelle/tests/doubletest.cocci b/helpers/coccinelle/tests/doubletest.cocci similarity index 100% rename from external/coccinelle/tests/doubletest.cocci rename to helpers/coccinelle/tests/doubletest.cocci diff --git a/external/coccinelle/tests/odd_ptr_err.cocci b/helpers/coccinelle/tests/odd_ptr_err.cocci similarity index 100% rename from external/coccinelle/tests/odd_ptr_err.cocci rename to helpers/coccinelle/tests/odd_ptr_err.cocci diff --git a/external/libshell/COPYING b/helpers/libshell/COPYING similarity index 100% rename from external/libshell/COPYING rename to helpers/libshell/COPYING diff --git a/external/libshell/LICENSE b/helpers/libshell/LICENSE similarity index 100% rename from external/libshell/LICENSE rename to helpers/libshell/LICENSE diff --git a/external/libshell/Makefile b/helpers/libshell/Makefile similarity index 100% rename from external/libshell/Makefile rename to helpers/libshell/Makefile diff --git a/external/libshell/SYMS b/helpers/libshell/SYMS similarity index 100% rename from external/libshell/SYMS rename to helpers/libshell/SYMS diff --git a/external/libshell/contrib/getoptx_1.0.bash b/helpers/libshell/contrib/getoptx_1.0.bash similarity index 100% rename from external/libshell/contrib/getoptx_1.0.bash rename to helpers/libshell/contrib/getoptx_1.0.bash diff --git a/external/libshell/contrib/getoptx_1.1.bash b/helpers/libshell/contrib/getoptx_1.1.bash similarity index 100% rename from external/libshell/contrib/getoptx_1.1.bash rename to helpers/libshell/contrib/getoptx_1.1.bash diff --git a/external/libshell/contrib/shell-array b/helpers/libshell/contrib/shell-array similarity index 100% rename from external/libshell/contrib/shell-array rename to helpers/libshell/contrib/shell-array diff --git a/external/libshell/contrib/shell-crc32 b/helpers/libshell/contrib/shell-crc32 similarity index 100% rename from external/libshell/contrib/shell-crc32 rename to helpers/libshell/contrib/shell-crc32 diff --git a/external/libshell/contrib/shell-lists b/helpers/libshell/contrib/shell-lists similarity index 100% rename from external/libshell/contrib/shell-lists rename to helpers/libshell/contrib/shell-lists diff --git a/external/libshell/contrib/shell-sort b/helpers/libshell/contrib/shell-sort similarity index 100% rename from external/libshell/contrib/shell-sort rename to helpers/libshell/contrib/shell-sort diff --git a/external/libshell/contrib/shell-stack b/helpers/libshell/contrib/shell-stack similarity index 100% rename from external/libshell/contrib/shell-stack rename to helpers/libshell/contrib/shell-stack diff --git a/external/libshell/docs/libshell.man b/helpers/libshell/docs/libshell.man similarity index 100% rename from external/libshell/docs/libshell.man rename to helpers/libshell/docs/libshell.man diff --git a/external/libshell/docs/shell-error.man b/helpers/libshell/docs/shell-error.man similarity index 100% rename from external/libshell/docs/shell-error.man rename to helpers/libshell/docs/shell-error.man diff --git a/external/libshell/shell-args b/helpers/libshell/shell-args similarity index 100% rename from external/libshell/shell-args rename to helpers/libshell/shell-args diff --git a/external/libshell/shell-cmdline b/helpers/libshell/shell-cmdline similarity index 100% rename from external/libshell/shell-cmdline rename to helpers/libshell/shell-cmdline diff --git a/external/libshell/shell-config b/helpers/libshell/shell-config similarity index 100% rename from external/libshell/shell-config rename to helpers/libshell/shell-config diff --git a/external/libshell/shell-error b/helpers/libshell/shell-error similarity index 100% rename from external/libshell/shell-error rename to helpers/libshell/shell-error diff --git a/external/libshell/shell-getopt b/helpers/libshell/shell-getopt similarity index 100% rename from external/libshell/shell-getopt rename to helpers/libshell/shell-getopt diff --git a/external/libshell/shell-ini-config b/helpers/libshell/shell-ini-config similarity index 100% rename from external/libshell/shell-ini-config rename to helpers/libshell/shell-ini-config diff --git a/external/libshell/shell-ip-address b/helpers/libshell/shell-ip-address similarity index 100% rename from external/libshell/shell-ip-address rename to helpers/libshell/shell-ip-address diff --git a/external/libshell/shell-mail-address b/helpers/libshell/shell-mail-address similarity index 100% rename from external/libshell/shell-mail-address rename to helpers/libshell/shell-mail-address diff --git a/external/libshell/shell-quote b/helpers/libshell/shell-quote similarity index 100% rename from external/libshell/shell-quote rename to helpers/libshell/shell-quote diff --git a/external/libshell/shell-regexp b/helpers/libshell/shell-regexp similarity index 100% rename from external/libshell/shell-regexp rename to helpers/libshell/shell-regexp diff --git a/external/libshell/shell-run b/helpers/libshell/shell-run similarity index 100% rename from external/libshell/shell-run rename to helpers/libshell/shell-run diff --git a/external/libshell/shell-signal b/helpers/libshell/shell-signal similarity index 100% rename from external/libshell/shell-signal rename to helpers/libshell/shell-signal diff --git a/external/libshell/shell-source b/helpers/libshell/shell-source similarity index 100% rename from external/libshell/shell-source rename to helpers/libshell/shell-source diff --git a/external/libshell/shell-string b/helpers/libshell/shell-string similarity index 100% rename from external/libshell/shell-string rename to helpers/libshell/shell-string diff --git a/external/libshell/shell-unittest b/helpers/libshell/shell-unittest similarity index 100% rename from external/libshell/shell-unittest rename to helpers/libshell/shell-unittest diff --git a/external/libshell/shell-var b/helpers/libshell/shell-var similarity index 100% rename from external/libshell/shell-var rename to helpers/libshell/shell-var diff --git a/external/libshell/shell-version b/helpers/libshell/shell-version similarity index 100% rename from external/libshell/shell-version rename to helpers/libshell/shell-version diff --git a/external/libshell/tests/cmdline_get b/helpers/libshell/tests/cmdline_get similarity index 100% rename from external/libshell/tests/cmdline_get rename to helpers/libshell/tests/cmdline_get diff --git a/external/libshell/tests/data/000-quote_shell_args-pattern b/helpers/libshell/tests/data/000-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/000-quote_shell_args-pattern rename to helpers/libshell/tests/data/000-quote_shell_args-pattern diff --git a/external/libshell/tests/data/000-quote_shell_args-result b/helpers/libshell/tests/data/000-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/000-quote_shell_args-result rename to helpers/libshell/tests/data/000-quote_shell_args-result diff --git a/external/libshell/tests/data/001-quote_shell_args-pattern b/helpers/libshell/tests/data/001-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/001-quote_shell_args-pattern rename to helpers/libshell/tests/data/001-quote_shell_args-pattern diff --git a/external/libshell/tests/data/001-quote_shell_args-result b/helpers/libshell/tests/data/001-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/001-quote_shell_args-result rename to helpers/libshell/tests/data/001-quote_shell_args-result diff --git a/external/libshell/tests/data/002-quote_shell_args-pattern b/helpers/libshell/tests/data/002-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/002-quote_shell_args-pattern rename to helpers/libshell/tests/data/002-quote_shell_args-pattern diff --git a/external/libshell/tests/data/002-quote_shell_args-result b/helpers/libshell/tests/data/002-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/002-quote_shell_args-result rename to helpers/libshell/tests/data/002-quote_shell_args-result diff --git a/external/libshell/tests/data/003-quote_shell_args-pattern b/helpers/libshell/tests/data/003-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/003-quote_shell_args-pattern rename to helpers/libshell/tests/data/003-quote_shell_args-pattern diff --git a/external/libshell/tests/data/003-quote_shell_args-result b/helpers/libshell/tests/data/003-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/003-quote_shell_args-result rename to helpers/libshell/tests/data/003-quote_shell_args-result diff --git a/external/libshell/tests/data/004-quote_shell_args-pattern b/helpers/libshell/tests/data/004-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/004-quote_shell_args-pattern rename to helpers/libshell/tests/data/004-quote_shell_args-pattern diff --git a/external/libshell/tests/data/004-quote_shell_args-result b/helpers/libshell/tests/data/004-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/004-quote_shell_args-result rename to helpers/libshell/tests/data/004-quote_shell_args-result diff --git a/external/libshell/tests/data/005-quote_shell_args-pattern b/helpers/libshell/tests/data/005-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/005-quote_shell_args-pattern rename to helpers/libshell/tests/data/005-quote_shell_args-pattern diff --git a/external/libshell/tests/data/005-quote_shell_args-result b/helpers/libshell/tests/data/005-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/005-quote_shell_args-result rename to helpers/libshell/tests/data/005-quote_shell_args-result diff --git a/external/libshell/tests/data/006-quote_shell_args-pattern b/helpers/libshell/tests/data/006-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/006-quote_shell_args-pattern rename to helpers/libshell/tests/data/006-quote_shell_args-pattern diff --git a/external/libshell/tests/data/006-quote_shell_args-result b/helpers/libshell/tests/data/006-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/006-quote_shell_args-result rename to helpers/libshell/tests/data/006-quote_shell_args-result diff --git a/external/libshell/tests/data/007-quote_shell_args-pattern b/helpers/libshell/tests/data/007-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/007-quote_shell_args-pattern rename to helpers/libshell/tests/data/007-quote_shell_args-pattern diff --git a/external/libshell/tests/data/007-quote_shell_args-result b/helpers/libshell/tests/data/007-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/007-quote_shell_args-result rename to helpers/libshell/tests/data/007-quote_shell_args-result diff --git a/external/libshell/tests/data/008-quote_shell_args-pattern b/helpers/libshell/tests/data/008-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/008-quote_shell_args-pattern rename to helpers/libshell/tests/data/008-quote_shell_args-pattern diff --git a/external/libshell/tests/data/008-quote_shell_args-result b/helpers/libshell/tests/data/008-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/008-quote_shell_args-result rename to helpers/libshell/tests/data/008-quote_shell_args-result diff --git a/external/libshell/tests/data/009-quote_shell_args-pattern b/helpers/libshell/tests/data/009-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/009-quote_shell_args-pattern rename to helpers/libshell/tests/data/009-quote_shell_args-pattern diff --git a/external/libshell/tests/data/009-quote_shell_args-result b/helpers/libshell/tests/data/009-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/009-quote_shell_args-result rename to helpers/libshell/tests/data/009-quote_shell_args-result diff --git a/external/libshell/tests/data/010-quote_shell_args-pattern b/helpers/libshell/tests/data/010-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/010-quote_shell_args-pattern rename to helpers/libshell/tests/data/010-quote_shell_args-pattern diff --git a/external/libshell/tests/data/010-quote_shell_args-result b/helpers/libshell/tests/data/010-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/010-quote_shell_args-result rename to helpers/libshell/tests/data/010-quote_shell_args-result diff --git a/external/libshell/tests/data/011-quote_shell_args-pattern b/helpers/libshell/tests/data/011-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/011-quote_shell_args-pattern rename to helpers/libshell/tests/data/011-quote_shell_args-pattern diff --git a/external/libshell/tests/data/011-quote_shell_args-result b/helpers/libshell/tests/data/011-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/011-quote_shell_args-result rename to helpers/libshell/tests/data/011-quote_shell_args-result diff --git a/external/libshell/tests/data/012-quote_shell_args-pattern b/helpers/libshell/tests/data/012-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/012-quote_shell_args-pattern rename to helpers/libshell/tests/data/012-quote_shell_args-pattern diff --git a/external/libshell/tests/data/012-quote_shell_args-result b/helpers/libshell/tests/data/012-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/012-quote_shell_args-result rename to helpers/libshell/tests/data/012-quote_shell_args-result diff --git a/external/libshell/tests/data/013-quote_shell_args-pattern b/helpers/libshell/tests/data/013-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/013-quote_shell_args-pattern rename to helpers/libshell/tests/data/013-quote_shell_args-pattern diff --git a/external/libshell/tests/data/013-quote_shell_args-result b/helpers/libshell/tests/data/013-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/013-quote_shell_args-result rename to helpers/libshell/tests/data/013-quote_shell_args-result diff --git a/external/libshell/tests/data/014-quote_shell_args-pattern b/helpers/libshell/tests/data/014-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/014-quote_shell_args-pattern rename to helpers/libshell/tests/data/014-quote_shell_args-pattern diff --git a/external/libshell/tests/data/014-quote_shell_args-result b/helpers/libshell/tests/data/014-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/014-quote_shell_args-result rename to helpers/libshell/tests/data/014-quote_shell_args-result diff --git a/external/libshell/tests/data/015-quote_shell_args-pattern b/helpers/libshell/tests/data/015-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/015-quote_shell_args-pattern rename to helpers/libshell/tests/data/015-quote_shell_args-pattern diff --git a/external/libshell/tests/data/015-quote_shell_args-result b/helpers/libshell/tests/data/015-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/015-quote_shell_args-result rename to helpers/libshell/tests/data/015-quote_shell_args-result diff --git a/external/libshell/tests/data/016-quote_shell_args-pattern b/helpers/libshell/tests/data/016-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/016-quote_shell_args-pattern rename to helpers/libshell/tests/data/016-quote_shell_args-pattern diff --git a/external/libshell/tests/data/016-quote_shell_args-result b/helpers/libshell/tests/data/016-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/016-quote_shell_args-result rename to helpers/libshell/tests/data/016-quote_shell_args-result diff --git a/external/libshell/tests/data/017-quote_shell_args-pattern b/helpers/libshell/tests/data/017-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/017-quote_shell_args-pattern rename to helpers/libshell/tests/data/017-quote_shell_args-pattern diff --git a/external/libshell/tests/data/017-quote_shell_args-result b/helpers/libshell/tests/data/017-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/017-quote_shell_args-result rename to helpers/libshell/tests/data/017-quote_shell_args-result diff --git a/external/libshell/tests/data/018-quote_shell_args-pattern b/helpers/libshell/tests/data/018-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/018-quote_shell_args-pattern rename to helpers/libshell/tests/data/018-quote_shell_args-pattern diff --git a/external/libshell/tests/data/018-quote_shell_args-result b/helpers/libshell/tests/data/018-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/018-quote_shell_args-result rename to helpers/libshell/tests/data/018-quote_shell_args-result diff --git a/external/libshell/tests/data/019-quote_shell_args-pattern b/helpers/libshell/tests/data/019-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/019-quote_shell_args-pattern rename to helpers/libshell/tests/data/019-quote_shell_args-pattern diff --git a/external/libshell/tests/data/019-quote_shell_args-result b/helpers/libshell/tests/data/019-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/019-quote_shell_args-result rename to helpers/libshell/tests/data/019-quote_shell_args-result diff --git a/external/libshell/tests/data/020-quote_shell_args-pattern b/helpers/libshell/tests/data/020-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/020-quote_shell_args-pattern rename to helpers/libshell/tests/data/020-quote_shell_args-pattern diff --git a/external/libshell/tests/data/020-quote_shell_args-result b/helpers/libshell/tests/data/020-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/020-quote_shell_args-result rename to helpers/libshell/tests/data/020-quote_shell_args-result diff --git a/external/libshell/tests/data/021-quote_shell_args-pattern b/helpers/libshell/tests/data/021-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/021-quote_shell_args-pattern rename to helpers/libshell/tests/data/021-quote_shell_args-pattern diff --git a/external/libshell/tests/data/021-quote_shell_args-result b/helpers/libshell/tests/data/021-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/021-quote_shell_args-result rename to helpers/libshell/tests/data/021-quote_shell_args-result diff --git a/external/libshell/tests/data/022-quote_shell_args-pattern b/helpers/libshell/tests/data/022-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/022-quote_shell_args-pattern rename to helpers/libshell/tests/data/022-quote_shell_args-pattern diff --git a/external/libshell/tests/data/022-quote_shell_args-result b/helpers/libshell/tests/data/022-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/022-quote_shell_args-result rename to helpers/libshell/tests/data/022-quote_shell_args-result diff --git a/external/libshell/tests/data/023-quote_shell_args-pattern b/helpers/libshell/tests/data/023-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/023-quote_shell_args-pattern rename to helpers/libshell/tests/data/023-quote_shell_args-pattern diff --git a/external/libshell/tests/data/023-quote_shell_args-result b/helpers/libshell/tests/data/023-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/023-quote_shell_args-result rename to helpers/libshell/tests/data/023-quote_shell_args-result diff --git a/external/libshell/tests/data/024-quote_shell_args-pattern b/helpers/libshell/tests/data/024-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/024-quote_shell_args-pattern rename to helpers/libshell/tests/data/024-quote_shell_args-pattern diff --git a/external/libshell/tests/data/024-quote_shell_args-result b/helpers/libshell/tests/data/024-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/024-quote_shell_args-result rename to helpers/libshell/tests/data/024-quote_shell_args-result diff --git a/external/libshell/tests/data/025-quote_shell_args-pattern b/helpers/libshell/tests/data/025-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/025-quote_shell_args-pattern rename to helpers/libshell/tests/data/025-quote_shell_args-pattern diff --git a/external/libshell/tests/data/025-quote_shell_args-result b/helpers/libshell/tests/data/025-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/025-quote_shell_args-result rename to helpers/libshell/tests/data/025-quote_shell_args-result diff --git a/external/libshell/tests/data/026-quote_shell_args-pattern b/helpers/libshell/tests/data/026-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/026-quote_shell_args-pattern rename to helpers/libshell/tests/data/026-quote_shell_args-pattern diff --git a/external/libshell/tests/data/026-quote_shell_args-result b/helpers/libshell/tests/data/026-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/026-quote_shell_args-result rename to helpers/libshell/tests/data/026-quote_shell_args-result diff --git a/external/libshell/tests/data/027-quote_shell_args-pattern b/helpers/libshell/tests/data/027-quote_shell_args-pattern similarity index 100% rename from external/libshell/tests/data/027-quote_shell_args-pattern rename to helpers/libshell/tests/data/027-quote_shell_args-pattern diff --git a/external/libshell/tests/data/027-quote_shell_args-result b/helpers/libshell/tests/data/027-quote_shell_args-result similarity index 100% rename from external/libshell/tests/data/027-quote_shell_args-result rename to helpers/libshell/tests/data/027-quote_shell_args-result diff --git a/external/libshell/tests/fatal b/helpers/libshell/tests/fatal similarity index 100% rename from external/libshell/tests/fatal rename to helpers/libshell/tests/fatal diff --git a/external/libshell/tests/fill_mask b/helpers/libshell/tests/fill_mask similarity index 100% rename from external/libshell/tests/fill_mask rename to helpers/libshell/tests/fill_mask diff --git a/external/libshell/tests/getopt b/helpers/libshell/tests/getopt similarity index 100% rename from external/libshell/tests/getopt rename to helpers/libshell/tests/getopt diff --git a/external/libshell/tests/ini-config/z.ini b/helpers/libshell/tests/ini-config/z.ini similarity index 100% rename from external/libshell/tests/ini-config/z.ini rename to helpers/libshell/tests/ini-config/z.ini diff --git a/external/libshell/tests/ini_config_get b/helpers/libshell/tests/ini_config_get similarity index 100% rename from external/libshell/tests/ini_config_get rename to helpers/libshell/tests/ini_config_get diff --git a/external/libshell/tests/ini_config_set b/helpers/libshell/tests/ini_config_set similarity index 100% rename from external/libshell/tests/ini_config_set rename to helpers/libshell/tests/ini_config_set diff --git a/external/libshell/tests/message b/helpers/libshell/tests/message similarity index 100% rename from external/libshell/tests/message rename to helpers/libshell/tests/message diff --git a/external/libshell/tests/opt_check_dir b/helpers/libshell/tests/opt_check_dir similarity index 100% rename from external/libshell/tests/opt_check_dir rename to helpers/libshell/tests/opt_check_dir diff --git a/external/libshell/tests/opt_check_number b/helpers/libshell/tests/opt_check_number similarity index 100% rename from external/libshell/tests/opt_check_number rename to helpers/libshell/tests/opt_check_number diff --git a/external/libshell/tests/opt_check_read b/helpers/libshell/tests/opt_check_read similarity index 100% rename from external/libshell/tests/opt_check_read rename to helpers/libshell/tests/opt_check_read diff --git a/external/libshell/tests/quote_sed_regexp b/helpers/libshell/tests/quote_sed_regexp similarity index 100% rename from external/libshell/tests/quote_sed_regexp rename to helpers/libshell/tests/quote_sed_regexp diff --git a/external/libshell/tests/quote_sed_regexp_variable b/helpers/libshell/tests/quote_sed_regexp_variable similarity index 100% rename from external/libshell/tests/quote_sed_regexp_variable rename to helpers/libshell/tests/quote_sed_regexp_variable diff --git a/external/libshell/tests/quote_shell b/helpers/libshell/tests/quote_shell similarity index 100% rename from external/libshell/tests/quote_shell rename to helpers/libshell/tests/quote_shell diff --git a/external/libshell/tests/quote_shell_args b/helpers/libshell/tests/quote_shell_args similarity index 100% rename from external/libshell/tests/quote_shell_args rename to helpers/libshell/tests/quote_shell_args diff --git a/external/libshell/tests/quote_shell_variable b/helpers/libshell/tests/quote_shell_variable similarity index 100% rename from external/libshell/tests/quote_shell_variable rename to helpers/libshell/tests/quote_shell_variable diff --git a/external/libshell/tests/runtests b/helpers/libshell/tests/runtests similarity index 100% rename from external/libshell/tests/runtests rename to helpers/libshell/tests/runtests diff --git a/external/libshell/tests/shell_var_trim b/helpers/libshell/tests/shell_var_trim similarity index 100% rename from external/libshell/tests/shell_var_trim rename to helpers/libshell/tests/shell_var_trim diff --git a/external/libshell/tests/shell_var_unquote b/helpers/libshell/tests/shell_var_unquote similarity index 100% rename from external/libshell/tests/shell_var_unquote rename to helpers/libshell/tests/shell_var_unquote diff --git a/external/libshell/tests/signal b/helpers/libshell/tests/signal similarity index 100% rename from external/libshell/tests/signal rename to helpers/libshell/tests/signal diff --git a/external/libshell/tests/signal-data/001-signal b/helpers/libshell/tests/signal-data/001-signal similarity index 100% rename from external/libshell/tests/signal-data/001-signal rename to helpers/libshell/tests/signal-data/001-signal diff --git a/external/libshell/tests/signal-data/002-signal b/helpers/libshell/tests/signal-data/002-signal similarity index 100% rename from external/libshell/tests/signal-data/002-signal rename to helpers/libshell/tests/signal-data/002-signal diff --git a/external/libshell/tests/signal-data/003-signal b/helpers/libshell/tests/signal-data/003-signal similarity index 100% rename from external/libshell/tests/signal-data/003-signal rename to helpers/libshell/tests/signal-data/003-signal diff --git a/external/libshell/tests/signal-data/004-signal b/helpers/libshell/tests/signal-data/004-signal similarity index 100% rename from external/libshell/tests/signal-data/004-signal rename to helpers/libshell/tests/signal-data/004-signal diff --git a/external/libshell/tests/signal-data/005-signal b/helpers/libshell/tests/signal-data/005-signal similarity index 100% rename from external/libshell/tests/signal-data/005-signal rename to helpers/libshell/tests/signal-data/005-signal diff --git a/external/libshell/tests/signal-data/006-signal b/helpers/libshell/tests/signal-data/006-signal similarity index 100% rename from external/libshell/tests/signal-data/006-signal rename to helpers/libshell/tests/signal-data/006-signal diff --git a/external/libshell/tests/signal-data/007-signal b/helpers/libshell/tests/signal-data/007-signal similarity index 100% rename from external/libshell/tests/signal-data/007-signal rename to helpers/libshell/tests/signal-data/007-signal diff --git a/external/libshell/tests/string_quote_remove b/helpers/libshell/tests/string_quote_remove similarity index 100% rename from external/libshell/tests/string_quote_remove rename to helpers/libshell/tests/string_quote_remove diff --git a/external/libshell/tests/verbose b/helpers/libshell/tests/verbose similarity index 100% rename from external/libshell/tests/verbose rename to helpers/libshell/tests/verbose diff --git a/external/remap-log.c b/helpers/remap-log.c similarity index 100% rename from external/remap-log.c rename to helpers/remap-log.c diff --git a/packaging/aiaiai.spec b/packaging/aiaiai.spec index aa5e7a7..45026c7 100644 --- a/packaging/aiaiai.spec +++ b/packaging/aiaiai.spec @@ -52,13 +52,13 @@ rm -rf %{buildroot}/usr/bin/packaging rm -rf %{buildroot}/usr/bin/doc rm %{buildroot}/usr/bin/*.c rm %{buildroot}/usr/bin/Makefile -rm %{buildroot}/usr/bin/external/*.c -rm %{buildroot}/usr/bin/external/Makefile +rm %{buildroot}/usr/bin/helpers/*.c +rm %{buildroot}/usr/bin/helpers/Makefile %files %defattr(-,root,root,-) %{_bindir}/aiaiai* -%{_bindir}/external +%{_bindir}/helpers %files email %defattr(-,root,root,-) diff --git a/tests/test-subj-parsing b/tests/test-subj-parsing index a5d3f64..19cd5b4 100755 --- a/tests/test-subj-parsing +++ b/tests/test-subj-parsing @@ -8,7 +8,7 @@ # it to the mscripts directory and run. srcdir="$(readlink -ev -- ${0%/*})" -PATH="$srcdir/..:$srcdir/../external/libshell:$PATH" +PATH="$srcdir/..:$srcdir/../helpers/libshell:$PATH" . shell-error . email/aiaiai-email-sh-functions